Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								df5cda7a98
								
							
						 | 
						
							
							
								
								new feature added for not loading submenus inside api for desktop
							
							
							
							
							
						 | 
						
							2013-10-16 09:37:39 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								fbea249782
								
							
						 | 
						
							
							
								
								jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5
							
							
							
							
							
						 | 
						
							2013-10-16 09:37:33 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2f673b20ad
								
							
						 | 
						
							
							
								
								disabling changes in desktop, missed out in last one
							
							
							
							
							
						 | 
						
							2013-09-30 17:25:02 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0a9fd6a4b5
								
							
						 | 
						
							
							
								
								some needed changes in api for desktop
							
							
							
							
							
						 | 
						
							2013-09-30 16:59:50 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								52c896d8c5
								
							
						 | 
						
							
							
								
								some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.
							
							
							
							
							
						 | 
						
							2013-09-26 20:11:45 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1d0ea6718f
								
							
						 | 
						
							
							
								
								brief added to desktop for all plugins
							
							
							
							
							
						 | 
						
							2013-09-25 18:23:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								82b6be483a
								
							
						 | 
						
							
							
								
								isotope embedded inside desktop kernel
							
							
							
							
							
						 | 
						
							2013-08-30 10:58:08 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b004121187
								
							
						 | 
						
							
							
								
								minimize bar updated to new style and more flexible.
							
							
							
							
							
						 | 
						
							2013-08-19 12:59:57 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a04155963d
								
							
						 | 
						
							
							
								
								all file things are fixed. delete and view and also names
							
							
							
							
							
						 | 
						
							2013-08-14 09:30:48 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6d54dbd5f8
								
							
						 | 
						
							
							
								
								bilingual for files fixed and description added and also filename display after selecting filenames
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js 
							
						 | 
						
							2013-08-13 17:22:09 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								cb070cc537
								
							
						 | 
						
							
							
								
								Updated Desktop with fix for forms for all users
							
							
							
							
							
						 | 
						
							2013-08-13 11:51:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e3d9966f76
								
							
						 | 
						
							
							
								
								bugs fixed for plugins. .. and also css fixed
							
							
							
							
							
						 | 
						
							2013-08-06 17:53:04 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								55d9aea664
								
							
						 | 
						
							
							
								
								Merged Desktop with New UI
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:38 +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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								8f334f6948
								
							
						 | 
						
							
							
								
								modularize conference
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								d4df7c82d3
								
							
						 | 
						
							
							
								
								relpace seminar to conference
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								68e14a7898
								
							
						 | 
						
							
							
								
								move js file to relational module but have js require problem
							
							
							
							
							
						 | 
						
							2013-01-14 17:54:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								919f951981
								
							
						 | 
						
							
							
								
								restore js,journal_pages.js,
							
							
							
							
							
						 | 
						
							2013-01-14 17:54:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								758cab5ecd
								
							
						 | 
						
							
							
								
								move journal code to persional_journal modulaar
							
							
							
							
							
						 | 
						
							2013-01-14 17:53:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								37f8c1637a
								
							
						 | 
						
							
							
								
								new desktop framework updates
							
							
							
							
							
						 | 
						
							2012-12-27 18:25:54 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ad8273d638
								
							
						 | 
						
							
							
								
								fixed fileview in english mode
							
							
							
							
							
						 | 
						
							2012-12-07 11:19:40 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c2285a34f6
								
							
						 | 
						
							
							
								
								stupid fix
							
							
							
							
							
						 | 
						
							2012-12-06 18:50:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8094ddc967
								
							
						 | 
						
							
							
								
								section fixed and some other fixes
							
							
							
							
							
						 | 
						
							2012-12-06 17:43:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								7430a05782
								
							
						 | 
						
							
							
								
								try to fix problem
							
							
							
							
							
						 | 
						
							2012-12-06 16:24:40 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								df4a9a5dff
								
							
						 | 
						
							
							
								
								scroll fixed...
							
							
							
							
							
						 | 
						
							2012-12-06 15:44:16 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								6a47fc8d62
								
							
						 | 
						
							
							
								
								view update
							
							
							
							
							
						 | 
						
							2012-12-06 11:43:40 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								5d76600154
								
							
						 | 
						
							
							
								
								view update
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								756bfa563b
								
							
						 | 
						
							
							
								
								view update
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3d1fb48489
								
							
						 | 
						
							
							
								
								edit coauthor relation done
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								a0cce2ae0d
								
							
						 | 
						
							
							
								
								view update
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:43 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								79dc99d431
								
							
						 | 
						
							
							
								
								br fixed
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:43 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								d03f5dc1ff
								
							
						 | 
						
							
							
								
								view update
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:43 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c6e0b56012
								
							
						 | 
						
							
							
								
								stupid bug fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								49d1ca6997
								
							
						 | 
						
							
							
								
								new type fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0e6c75e677
								
							
						 | 
						
							
							
								
								form for coauthor - fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a6a50227eb
								
							
						 | 
						
							
							
								
								new type fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f7f55850fe
								
							
						 | 
						
							
							
								
								coauthor edit and destroy fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5986817e16
								
							
						 | 
						
							
							
								
								add journal_list. now, those pair, (journal_title, journal_levels), is uniq
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								3933c048b0
								
							
						 | 
						
							
							
								
								delete fixed
							
							
							
							
							
						 | 
						
							2012-11-23 13:22:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f38f32ac8b
								
							
						 | 
						
							
							
								
								delete update
							
							
							
							
							
						 | 
						
							2012-11-23 10:46:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								9189ebffee
								
							
						 | 
						
							
							
								
								correct 'edit' button of journal list
							
							
							
							
							
						 | 
						
							2012-11-22 18:15:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								645f25d446
								
							
						 | 
						
							
							
								
								make fake data
							
							
							
							
							
						 | 
						
							2012-11-22 16:34:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								9e400e6e6a
								
							
						 | 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...
							
							
							
							
							
						 | 
						
							2012-11-22 10:49:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								bb69a059e8
								
							
						 | 
						
							
							
								
								hidden file field, and fixed updated function
							
							
							
							
							
						 | 
						
							2012-11-22 02:37:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c94940214c
								
							
						 | 
						
							
							
								
								small fix for journal_pages desktop
							
							
							
							
							
						 | 
						
							2012-11-21 17:11:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b571373c8f
								
							
						 | 
						
							
							
								
								new file created for journal pages
							
							
							
							
							
						 | 
						
							2012-11-21 15:35:23 +08:00 |