saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								155039ac16
								
							
						 | 
						
							
							
								
								Updated fixes for site info - desktop openess, title always displayed
							
							
							
							
							
						 | 
						
							2013-10-16 18:33:57 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								1d0ea6718f
								
							
						 | 
						
							
							
								
								brief added to desktop for all plugins
							
							
							
							
							
						 | 
						
							2013-09-25 18:23:44 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fa857cfeea
								
							
						 | 
						
							
							
								
								Default Locale
							
							
							
							
							
						 | 
						
							2013-09-06 18:00:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								42615f02ea
								
							
						 | 
						
							
							
								
								new feature in desktop for uploading wallpapers or putting url link
							
							
							
							
							
						 | 
						
							2013-08-02 19:32:41 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f7dbbf1bca
								
							
						 | 
						
							
							
								
								new themes added to desktop plus theme uploader created
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6d89eab98a
								
							
						 | 
						
							
							
								
								desktop final fix
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:28 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								38194311ab
								
							
						 | 
						
							
							
								
								some changes again
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:18 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5f9190db39
								
							
						 | 
						
							
							
								
								few updates with fb integration and some other changes in user and supports data to android
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb 
							
						 | 
						
							2013-07-30 16:43:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ed22a4d303
								
							
						 | 
						
							
							
								
								apps update -- app upload and activation
							
							
							
							
							
						 | 
						
							2013-07-30 16:42:50 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								f2ada14b7a
								
							
						 | 
						
							
							
								
								app manager's view update
							
							
							
							
							
						 | 
						
							2013-07-30 16:42:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2d616ab7a8
								
							
						 | 
						
							
							
								
								solved desktop conflict during cherry pick
							
							
							
							
							
						 | 
						
							2013-07-30 16:42:26 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								dc94283af9
								
							
						 | 
						
							
							
								
								duplicate error fixed and css inside widgets fixed, duplicate location fixed
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:38 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bc0477a5ed
								
							
						 | 
						
							
							
								
								widget and gridster fixes
							
							
							
							
							
						 | 
						
							2013-04-17 14:16:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								793d739726
								
							
						 | 
						
							
							
								
								features and widgets added
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/orbitdesktop.js 
							
						 | 
						
							2013-04-17 14:14:23 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b8ee2fd559
								
							
						 | 
						
							
							
								
								compatibility page added and tinyscrollbar drag event fixed..
							
							
							
							
							
						 | 
						
							2013-04-17 11:07:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9f362d9ae6
								
							
						 | 
						
							
							
								
								gridster, url code fixed, views removed.
							
							
							
							
							
						 | 
						
							2013-02-25 11:08:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								284bf34fec
								
							
						 | 
						
							
							
								
								amend file value to correct format
							
							
							
							
							
						 | 
						
							2013-01-14 17:53:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								08b99011d0
								
							
						 | 
						
							
							
								
								all sections and sections megerd
							
							
							
							
							
						 | 
						
							2012-12-07 10:10:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a56d80698f
								
							
						 | 
						
							
							
								
								desktop api update..
							
							
							
							
							
						 | 
						
							2012-11-12 15:11:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								da5e7f670e
								
							
						 | 
						
							
							
								
								Desktop Widgtes updates..
							
							
							
							
							
						 | 
						
							2012-11-06 10:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1daf405b3d
								
							
						 | 
						
							
							
								
								Gallery started.
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a3a1e4b92e
								
							
						 | 
						
							
							
								
								controller change, views working and db for paper and journals
							
							
							
							
							
						 | 
						
							2012-05-03 21:30:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c158375d02
								
							
						 | 
						
							
							
								
								with connection and some save settings…
							
							
							
							
							
						 | 
						
							2012-04-26 21:30:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								64be61d61b
								
							
						 | 
						
							
							
								
								with gmail widget..
							
							
							
							
							
						 | 
						
							2012-04-26 14:47:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a298cbd5f6
								
							
						 | 
						
							
							
								
								Publication started
							
							
							
							
							
						 | 
						
							2012-04-24 16:45:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								670ec2a40e
								
							
						 | 
						
							
							
								
								Themes from db fixed..
							
							
							
							
							
						 | 
						
							2012-04-23 21:04:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3eaf97babe
								
							
						 | 
						
							
							
								
								title and heading and welcome msg…
							
							
							
							
							
						 | 
						
							2012-04-19 20:26:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4bad25e682
								
							
						 | 
						
							
							
								
								Msg box added and background image saving complete
							
							
							
							
							
						 | 
						
							2012-04-18 22:01:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								95a1e266ae
								
							
						 | 
						
							
							
								
								Custom thème done and theme id done…
							
							
							
							
							
						 | 
						
							2012-04-17 21:15:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								02c6933d0b
								
							
						 | 
						
							
							
								
								Tiles position saved in db and also change them from section manager
							
							
							
							
							
						 | 
						
							2012-04-17 16:33:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								193cee2df7
								
							
						 | 
						
							
							
								
								new icons and widgets
							
							
							
							
							
						 | 
						
							2012-04-12 22:18:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								01af32aa60
								
							
						 | 
						
							
							
								
								added divs with id
							
							
							
							
							
						 | 
						
							2012-04-12 16:52:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								48323ac1af
								
							
						 | 
						
							
							
								
								lot of changes in fetching
							
							
							
							
							
						 | 
						
							2012-04-12 14:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								25ca29403c
								
							
						 | 
						
							
							
								
								section page added
							
							
							
							
							
						 | 
						
							2012-04-11 17:58:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5a6541a592
								
							
						 | 
						
							
							
								
								Setting page update
							
							
							
							
							
						 | 
						
							2012-04-11 17:26:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								edf6089e0c
								
							
						 | 
						
							
							
								
								Devin complete
							
							
							
							
							
						 | 
						
							2012-04-11 15:34:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4875b339f8
								
							
						 | 
						
							
							
								
								Fetching desktop from db
							
							
							
							
							
						 | 
						
							2012-04-11 15:31:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								32a1be624b
								
							
						 | 
						
							
							
								
								Fully updated..
							
							
							
							
							
						 | 
						
							2012-04-09 17:55:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								35567c2139
								
							
						 | 
						
							
							
								
								Widgets Loading dynamically and semi structured
							
							
							
							
							
						 | 
						
							2012-04-06 23:48:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e1ef2b28e7
								
							
						 | 
						
							
							
								
								theme changes
							
							
							
							
							
						 | 
						
							2012-04-06 17:49:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7309d9c446
								
							
						 | 
						
							
							
								
								Dock change and getting values from db
							
							
							
							
							
						 | 
						
							2012-04-06 17:49:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f5c080efd4
								
							
						 | 
						
							
							
								
								Model commit
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ddf6a606a2
								
							
						 | 
						
							
							
								
								with notifications and other changes
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6158799a47
								
							
						 | 
						
							
							
								
								Stupid theme
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								77b2919d8c
								
							
						 | 
						
							
							
								
								Desktop Commit
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								39e1bc8948
								
							
						 | 
						
							
							
								
								new setting page
							
							
							
							
							
						 | 
						
							2012-04-05 20:09:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								aa3997f7cf
								
							
						 | 
						
							
							
								
								with notifications and other changes
							
							
							
							
							
						 | 
						
							2012-03-29 19:50:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								176597f5af
								
							
						 | 
						
							
							
								
								Stupid theme
							
							
							
							
							
						 | 
						
							2012-03-29 15:23:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2e283a039d
								
							
						 | 
						
							
							
								
								Desktop Commit
							
							
							
							
							
						 | 
						
							2012-03-28 18:53:30 +08:00 |