Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								42615f02ea
								
							
						 | 
						
							
							
								
								new feature in desktop for uploading wallpapers or putting url link
							
							
							
							
							
						 | 
						
							2013-08-02 19:32:41 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d9079d9d7c
								
							
						 | 
						
							
							
								
								Updated with icons, latest js and css for desktop
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:47 +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 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7e9fce0c2d
								
							
						 | 
						
							
							
								
								clean Harry's code
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								38d5a193e0
								
							
						 | 
						
							
							
								
								tiny scrollbar trigger fixed and devin branch merged
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								989e5aa974
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:56 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dd10b3147c
								
							
						 | 
						
							
							
								
								Fix js bug and asset url after merge
							
							
							
							
							
						 | 
						
							2013-04-17 14:14:24 +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 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d840b82fa9
								
							
						 | 
						
							
							
								
								insert and remove columns
							
							
							
							
							
						 | 
						
							2013-04-17 10:56:15 +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 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3182f5c9a8
								
							
						 | 
						
							
							
								
								merging
							
							
							
							
							
						 | 
						
							2013-03-05 11:20:01 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								dc92ef9f42
								
							
						 | 
						
							
							
								
								simple layout tinyscrollbar fixed
							
							
							
							
							
						 | 
						
							2013-03-05 11:04:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								4e24223c78
								
							
						 | 
						
							
							
								
								desktop CSS update
							
							
							
							
							
						 | 
						
							2013-03-05 09:39:01 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ee5fd18b64
								
							
						 | 
						
							
							
								
								highlighting fixed…
							
							
							
							
							
						 | 
						
							2013-03-04 17:44:55 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c1cb5e5ffb
								
							
						 | 
						
							
							
								
								tinyscrollbar_bug fixed
							
							
							
							
							
						 | 
						
							2013-03-01 17:49:58 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9b8ab2a2c1
								
							
						 | 
						
							
							
								
								url handling modified.. tinyscrollbar modified… star checkbox fixed..
							
							
							
							
							
						 | 
						
							2013-03-01 14:45:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c82e9a646d
								
							
						 | 
						
							
							
								
								tinyscrollbar fixed
							
							
							
							
							
						 | 
						
							2013-02-27 18:55:26 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								912080482b
								
							
						 | 
						
							
							
								
								some changes for gridster
							
							
							
							
							
						 | 
						
							2013-02-27 11:47:41 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e9c0f443b7
								
							
						 | 
						
							
							
								
								Lot of changes in gridster
							
							
							
							
							
						 | 
						
							2013-02-26 11:47:39 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								edd2c1f522
								
							
						 | 
						
							
							
								
								css minor changes.
							
							
							
							
							
						 | 
						
							2013-02-25 11:08:57 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9f362d9ae6
								
							
						 | 
						
							
							
								
								gridster, url code fixed, views removed.
							
							
							
							
							
						 | 
						
							2013-02-25 11:08:56 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								37f8c1637a
								
							
						 | 
						
							
							
								
								new desktop framework updates
							
							
							
							
							
						 | 
						
							2012-12-27 18:25:54 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								08b99011d0
								
							
						 | 
						
							
							
								
								all sections and sections megerd
							
							
							
							
							
						 | 
						
							2012-12-07 10:10:38 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8094ddc967
								
							
						 | 
						
							
							
								
								section fixed and some other fixes
							
							
							
							
							
						 | 
						
							2012-12-06 17:43:19 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7d865a65e2
								
							
						 | 
						
							
							
								
								coauthor edit and destroy fixed
							
							
							
							
							
						 | 
						
							2012-12-03 12:23:56 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								944daff524
								
							
						 | 
						
							
							
								
								jumping menus updated..
							
							
							
							
							
						 | 
						
							2012-11-29 16:46:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2f67a96532
								
							
						 | 
						
							
							
								
								url fixed and edit form fixed for tinyscrollbar
							
							
							
							
							
						 | 
						
							2012-11-28 18:12:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9cc518b456
								
							
						 | 
						
							
							
								
								autocomplete done
							
							
							
							
							
						 | 
						
							2012-11-27 15:55:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								868d1c2201
								
							
						 | 
						
							
							
								
								fix for json and some other bugs
							
							
							
							
							
						 | 
						
							2012-11-22 21:06:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								73e76f2477
								
							
						 | 
						
							
							
								
								routes fixed
							
							
							
							
							
						 | 
						
							2012-11-21 18:36:56 +08:00 |