devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								874819266d
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-07-30 16:42:23 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								ad68f63a7a
								
							
						 | 
						
							
							
								
								style for checkbox, radio button
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:58 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								20521dc8b0
								
							
						 | 
						
							
							
								
								removing duplicate code from js file
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:54 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								a458a50e97
								
							
						 | 
						
							
							
								
								publication's view update
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:48 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ae8033ea1b
								
							
						 | 
						
							
							
								
								duplicate error fixed and css inside widgets fixed, duplicate location fixed
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								78d6e33865
								
							
						 | 
						
							
							
								
								devin branch merge plus minor fixes
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b70310c6fe
								
							
						 | 
						
							
							
								
								tiny scrollbar update
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:25 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								856898016b
								
							
						 | 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)
							
							
							
							
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 | 
						
							2013-07-02 16:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								adc15951bb
								
							
						 | 
						
							
							
								
								questionnaire stuff
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb 
							
						 | 
						
							2013-06-06 18:29:58 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								127ab3845c
								
							
						 | 
						
							
							
								
								Changes for queries
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								167a71272a
								
							
						 | 
						
							
							
								
								queries need to be rethink
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								64101109dd
								
							
						 | 
						
							
							
								
								disable all sorted_tags
							
							
							
							
							
						 | 
						
							2013-04-26 18:07:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d047a3d62a
								
							
						 | 
						
							
							
								
								chris tags update
							
							
							
							
							
						 | 
						
							2013-04-26 11:26:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								38d5a193e0
								
							
						 | 
						
							
							
								
								tiny scrollbar trigger fixed and devin branch merged
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								055d758769
								
							
						 | 
						
							
							
								
								Page Loading Effect
							
							
							
							
							
							
							
							tinyscrollbar has problem 
							
						 | 
						
							2013-04-17 14:27:18 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d288972035
								
							
						 | 
						
							
							
								
								stupid commit
							
							
							
							
							
						 | 
						
							2013-04-17 14:19:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bc0477a5ed
								
							
						 | 
						
							
							
								
								widget and gridster fixes
							
							
							
							
							
						 | 
						
							2013-04-17 14:16:24 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e7bffe4c0f
								
							
						 | 
						
							
							
								
								devin's new branch
							
							
							
							
							
						 | 
						
							2013-04-17 14:14:24 +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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								95805cfdee
								
							
						 | 
						
							
							
								
								correct model method
							
							
							
							
							
						 | 
						
							2013-04-17 14:07:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								44fede2b71
								
							
						 | 
						
							
							
								
								fixed co author relation save button
							
							
							
							
							
						 | 
						
							2013-04-17 14:01:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								27ad25ccca
								
							
						 | 
						
							
							
								
								add pagination for every controller and view in personal plugin
							
							
							
							
							
						 | 
						
							2013-04-17 14:00:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								df220397b2
								
							
						 | 
						
							
							
								
								make index of list can be hightline list when click cancel button
							
							
							
							
							
						 | 
						
							2013-04-17 12:22:04 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								6db9e70132
								
							
						 | 
						
							
							
								
								Major tinyscrollbar update
							
							
							
							
							
						 | 
						
							2013-04-17 12:04:22 +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 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								dae3f069ff
								
							
						 | 
						
							
							
								
								app manager changed plus some changes
							
							
							
							
							
						 | 
						
							2013-04-17 11:09:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5f2c669568
								
							
						 | 
						
							
							
								
								fixed checkout and start in personal plugin
							
							
							
							
							
						 | 
						
							2013-04-17 11:08:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								1b12412596
								
							
						 | 
						
							
							
								
								correct factoried girl for journal
							
							
							
							
							
						 | 
						
							2013-04-17 11:08:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								50449b55e8
								
							
						 | 
						
							
							
								
								one abstract one column for personal plugin
							
							
							
							
							
						 | 
						
							2013-04-17 11:07:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								00db66b8c4
								
							
						 | 
						
							
							
								
								add pagination for every controller and view in personal plugin
							
							
							
							
							
						 | 
						
							2013-04-17 11:07:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								401c75c0de
								
							
						 | 
						
							
							
								
								Major tinyscrollbar update
							
							
							
							
							
						 | 
						
							2013-04-17 11:06:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								1ebae504dc
								
							
						 | 
						
							
							
								
								modify translation for journal_co_author_relation button
							
							
							
							
							
						 | 
						
							2013-04-17 11:05:57 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								323fadc210
								
							
						 | 
						
							
							
								
								tinyscrollbar pagination fixed
							
							
							
							
							
						 | 
						
							2013-04-17 11:05:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5178ce3bde
								
							
						 | 
						
							
							
								
								modify nil of email string and sort
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								95128a3465
								
							
						 | 
						
							
							
								
								remove redundant space of co_author sample data
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								8783b8e5fe
								
							
						 | 
						
							
							
								
								make index of list can be hightline list when click cancel button
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								a3de4cc2d4
								
							
						 | 
						
							
							
								
								fixed author sample data generation and model method
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								bdaef3af0f
								
							
						 | 
						
							
							
								
								add author filter for journal and fix some bug
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:52 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								db60a3bcfa
								
							
						 | 
						
							
							
								
								insert and remove columns
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a7667d586a
								
							
						 | 
						
							
							
								
								Major tinyscrollbar update
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								e9ddb85734
								
							
						 | 
						
							
							
								
								add pagination for personal plugin
							
							
							
							
							
						 | 
						
							2013-04-17 10:56:49 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d840b82fa9
								
							
						 | 
						
							
							
								
								insert and remove columns
							
							
							
							
							
						 | 
						
							2013-04-17 10:56:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								15be80a35f
								
							
						 | 
						
							
							
								
								fixed bug
							
							
							
							
							
						 | 
						
							2013-04-17 10:56:14 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1d06bcaae7
								
							
						 | 
						
							
							
								
								Major tinyscrollbar update
							
							
							
							
							
						 | 
						
							2013-04-17 10:54:38 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0189d1c2c0
								
							
						 | 
						
							
							
								
								all none fixed
							
							
							
							
							
						 | 
						
							2013-04-17 10:54:38 +08:00 |