Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2416030adc
								
							
						 | 
						
							
							
								
								remove useless rake task
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:09 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								38d5a193e0
								
							
						 | 
						
							
							
								
								tiny scrollbar trigger fixed and devin branch merged
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								fcfdd562a6
								
							
						 | 
						
							
							
								
								reverse harrys db setting
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:56 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								989e5aa974
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								4cbf2fd8b9
								
							
						 | 
						
							
							
								
								complete harrys code
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								c94a86c3a4
								
							
						 | 
						
							
							
								
								web_resource rake web_link_url:web_link_url_i18n
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:04 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								aedab01ae6
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:04 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								e3782c9cf7
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:04 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e2802d94d0
								
							
						 | 
						
							
							
								
								rake task added
							
							
							
							
							
						 | 
						
							2013-04-17 14:28:13 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								055d758769
								
							
						 | 
						
							
							
								
								Page Loading Effect
							
							
							
							
							
							
							
							tinyscrollbar has problem 
							
						 | 
						
							2013-04-17 14:27:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								0734f73291
								
							
						 | 
						
							
							
								
								faq show fix
							
							
							
							
							
						 | 
						
							2013-04-17 14:25:05 +08:00 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								d288972035
								
							
						 | 
						
							
							
								
								stupid commit
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								95805cfdee
								
							
						 | 
						
							
							
								
								correct model method
							
							
							
							
							
						 | 
						
							2013-04-17 14:07:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								84afbfa86c
								
							
						 | 
						
							
							
								
								section page fixed..
							
							
							
							
							
						 | 
						
							2013-04-17 14:01:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								44fede2b71
								
							
						 | 
						
							
							
								
								fixed co author relation save button
							
							
							
							
							
						 | 
						
							2013-04-17 14:01:48 +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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								27ad25ccca
								
							
						 | 
						
							
							
								
								add pagination for every controller and view in personal plugin
							
							
							
							
							
						 | 
						
							2013-04-17 14:00:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f9e7cefc94
								
							
						 | 
						
							
							
								
								compatibility page added and tinyscrollbar drag event fixed..
							
							
							
							
							
						 | 
						
							2013-04-17 13:59:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								df220397b2
								
							
						 | 
						
							
							
								
								make index of list can be hightline list when click cancel button
							
							
							
							
							
						 | 
						
							2013-04-17 12:22:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								b5fd6c7a1a
								
							
						 | 
						
							
							
								
								fixed author sample data generation and model method
							
							
							
							
							
						 | 
						
							2013-04-17 12:21:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								65e306a854
								
							
						 | 
						
							
							
								
								have done conference author filter, journal haven't been done, yet
							
							
							
							
							
						 | 
						
							2013-04-17 12:13:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								41643d1f61
								
							
						 | 
						
							
							
								
								tinyscrollbar pagination fixed
							
							
							
							
							
						 | 
						
							2013-04-17 12:11:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								aad4119892
								
							
						 | 
						
							
							
								
								fixed bug
							
							
							
							
							
						 | 
						
							2013-04-17 12:07:11 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								dabceec3ea
								
							
						 | 
						
							
							
								
								all none for conf done
							
							
							
							
							
						 | 
						
							2013-04-17 11:23:03 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								52789fa032
								
							
						 | 
						
							
							
								
								all none fixed
							
							
							
							
							
						 | 
						
							2013-04-17 11:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								dc68f40cb4
								
							
						 | 
						
							
							
								
								correct model method
							
							
							
							
							
						 | 
						
							2013-04-17 11:13:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								228dd1b767
								
							
						 | 
						
							
							
								
								fixed co author relation save button
							
							
							
							
							
						 | 
						
							2013-04-17 11:13:32 +08:00 |