|  Matt K. Fu | a4ebe31ada | fix for widget edit  js missing | 2013-04-17 14:19:32 +08:00 | 
				
					
						|  Matt K. Fu | 3098496083 | widget link followed by setting | 2013-04-17 14:19:32 +08:00 | 
				
					
						|  Matt K. Fu | 28f0df5da8 | fix default widget link failed | 2013-04-17 14:19:32 +08:00 | 
				
					
						|  Matt K. Fu | 3de4591413 | fix frontend ajax respond 404 due to javascript overwritten after assets precompile | 2013-04-17 14:19:32 +08:00 | 
				
					
						|  devin chen | d177fe0369 | minor update | 2013-04-17 14:19:32 +08:00 | 
				
					
						|  Harry Bomrah | c6868bf2e0 | small fix in select2.js | 2013-04-17 14:18:49 +08:00 | 
				
					
						|  devin chen | 95e308e046 | minor update | 2013-04-17 14:18:49 +08:00 | 
				
					
						|  Matt K. Fu | 425a320c02 | fix widget and fronted setting interface. checked with Spen | 2013-04-17 14:16:24 +08:00 | 
				
					
						|  devin chen | dc5f24ab22 | starting new branch ( add rules in .gitignore for SASS cache folder ) | 2013-04-17 14:16:24 +08:00 | 
				
					
						|  Harry Bomrah | bc0477a5ed | widget and gridster fixes | 2013-04-17 14:16:24 +08:00 | 
				
					
						|  Matt K. Fu | 0781779ac0 | solved conflicts | 2013-04-17 14:14:24 +08:00 | 
				
					
						|  devin | e7bffe4c0f | devin's new branch | 2013-04-17 14:14:24 +08:00 | 
				
					
						|  chris | dd10b3147c | Fix js bug and asset url after merge | 2013-04-17 14:14:24 +08:00 | 
				
					
						|  devin | cae43e8acd | recover .gitignore file Conflicts:
	.gitignore | 2013-04-17 14:14:23 +08:00 | 
				
					
						|  Harry Bomrah | 793d739726 | features and widgets added Conflicts:
	app/assets/javascripts/orbitdesktop.js | 2013-04-17 14:14:23 +08:00 | 
				
					
						|  devin | c8aa50ee87 | Lots of Update 1. CSS to SCSS
2. Journal Paper update
Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb | 2013-04-17 14:14:23 +08:00 | 
				
					
						|  Matt K. Fu | 0f6f5aafce | fix for both part and page part settings Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb | 2013-04-17 14:12:52 +08:00 | 
				
					
						|  Fu Matthew | f6b600df59 | deliver API | 2013-04-17 14:09:01 +08:00 | 
				
					
						|  chris | 6af375efa4 | Fix bug in setup_app_frontend_and_style | 2013-04-17 14:09:00 +08:00 | 
				
					
						|  Fu Matthew | 1709773b0a | style for front end | 2013-04-17 14:08:01 +08:00 | 
				
					
						|  Harry Bomrah | 764f83d58c | app manager changed plus some changes | 2013-04-17 14:01:14 +08:00 | 
				
					
						|  Harry Bomrah | 8dee211ab4 | section page fixed.. | 2013-04-17 14:01:14 +08:00 | 
				
					
						|  Harry Bomrah | f9e7cefc94 | compatibility page added and tinyscrollbar drag event fixed.. | 2013-04-17 13:59:16 +08:00 | 
				
					
						|  Harry Bomrah | 41643d1f61 | tinyscrollbar pagination fixed | 2013-04-17 12:11:33 +08:00 | 
				
					
						|  Harry Bomrah | 54af5e8bd4 | insert and remove columns | 2013-04-17 12:06:33 +08:00 | 
				
					
						|  Harry Bomrah | 6db9e70132 | Major tinyscrollbar update | 2013-04-17 12:04:22 +08:00 | 
				
					
						|  Harry Bomrah | dae3f069ff | app manager changed plus some changes | 2013-04-17 11:09:56 +08:00 | 
				
					
						|  Harry Bomrah | b1d7d5345e | section page fixed.. | 2013-04-17 11:08:58 +08:00 | 
				
					
						|  Fu Matthew | 6efef253a6 | add conditions for making multi cates and tags more stable | 2013-04-17 11:08:57 +08:00 | 
				
					
						|  devin | 0d5ab20efa | add browser compatibility page | 2013-04-17 11:07:45 +08:00 | 
				
					
						|  Fu Matthew | 9815950083 | now default options can be chosen by developer at init | 2013-04-17 11:07:45 +08:00 | 
				
					
						|  Harry Bomrah | b8ee2fd559 | compatibility page added and tinyscrollbar drag event fixed.. | 2013-04-17 11:07:20 +08:00 | 
				
					
						|  Harry Bomrah | 323fadc210 | tinyscrollbar pagination fixed | 2013-04-17 11:05:57 +08:00 | 
				
					
						|  Fu Matthew | 69a49a69aa | style for front end | 2013-04-17 11:05:57 +08:00 | 
				
					
						|  Rueshyna | 625f2e9ad6 | have done conference author filter, journal haven't been done, yet | 2013-04-17 11:04:52 +08:00 | 
				
					
						|  Harry Bomrah | d840b82fa9 | insert and remove columns | 2013-04-17 10:56:15 +08:00 | 
				
					
						|  devin | 84dfb44e78 | tinyscrollbar css minor update | 2013-04-17 10:56:15 +08:00 | 
				
					
						|  Fu Matthew | 4a08a1992b | 1.make module app forbid unearthed access except from admin 2.override sidebar link when it's object_auth or app_auth. | 2013-04-17 10:56:15 +08:00 | 
				
					
						|  Harry Bomrah | 1d06bcaae7 | Major tinyscrollbar update | 2013-04-17 10:54:38 +08:00 | 
				
					
						|  Fu Matthew | 8e98cb3ec9 | put add admin pages using orbit back end controller | 2013-04-17 10:54:38 +08:00 | 
				
					
						|  Harry Bomrah | 0189d1c2c0 | all none fixed | 2013-04-17 10:54:38 +08:00 | 
				
					
						|  chris | 3e96cfe514 | Changes for FAQ to work with not latest but stable code | 2013-03-28 15:05:52 +08:00 | 
				
					
						|  chris | da8a5123c2 | Change in announcement init for query Change in default widget query | 2013-03-27 16:31:42 +08:00 | 
				
					
						|  chris | d01968dcd0 | Changes in query for default widget | 2013-03-21 02:29:56 +08:00 | 
				
					
						|  chris | 617ebfd43a | Revert "Fix query for top in bulletin" This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f. | 2013-03-19 23:44:02 +08:00 | 
				
					
						|  chris | b55988af33 | Fix query for top in bulletin | 2013-03-19 23:44:02 +08:00 | 
				
					
						|  chris | 9684189258 | Fix query for date in bulletin | 2013-03-19 23:43:59 +08:00 | 
				
					
						|  chris | 8374bc8d12 | Set I18n from browser | 2013-03-19 23:43:31 +08:00 | 
				
					
						|  chris | 9cf8c2b72b | Revert "Page front end stay in the same page when a link is clicked (category)" This reverts commit 14d856b4d6. | 2013-03-19 20:00:16 +08:00 | 
				
					
						|  chris | 14d856b4d6 | Page front end stay in the same page when a link is clicked (category) | 2013-03-19 19:44:04 +08:00 |