Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								79c7f8e90f
								
							
						 | 
						
							
							
								
								new orbit bar fixed..
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb 
							
						 | 
						
							2013-07-30 16:43:35 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f7dbbf1bca
								
							
						 | 
						
							
							
								
								new themes added to desktop plus theme uploader created
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:32 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								2b12a4775c
								
							
						 | 
						
							
							
								
								Various view update and change #thmbackground tag
							
							
							
							
							
						 | 
						
							2013-07-30 16:43:02 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								4215ed5538
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-07-30 16:41:16 +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 |