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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								3cde26ca4a
								
							
						 | 
						
							
							
								
								gridster update
							
							
							
							
							
						 | 
						
							2013-07-30 16:42:53 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								e0e1c30f68
								
							
						 | 
						
							
							
								
								delete onside widget in db
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								da5e7f670e
								
							
						 | 
						
							
							
								
								Desktop Widgtes updates..
							
							
							
							
							
						 | 
						
							2012-11-06 10:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ca3e06c58b
								
							
						 | 
						
							
							
								
								update for desktop widgets
							
							
							
							
							
						 | 
						
							2012-11-05 11:40:11 +08:00 |