4c217ec12f 
								
							 
						 
						
							
							
								
								Updated Authorizations for Adbanner, Calendar, Location  
							
							
							
						 
						
							2013-08-22 15:20:50 +08:00  
				
					
						
							
							
								 
						
							
								452da1b8ec 
								
							 
						 
						
							
							
								
								Updated Desktop Themes controller  
							
							
							
						 
						
							2013-08-22 14:14:19 +08:00  
				
					
						
							
							
								 
						
							
								ec40591489 
								
							 
						 
						
							
							
								
								Make the filter for authorisation easier for developers  
							
							
							
						 
						
							2013-08-22 12:17:50 +08:00  
				
					
						
							
							
								 
						
							
								4078d426a6 
								
							 
						 
						
							
							
								
								new ui personal front_end page(member app) & users_new_interface show sub_roles fix  
							
							
							
						 
						
							2013-08-21 14:13:36 +08:00  
				
					
						
							
							
								 
						
							
								c474fa063f 
								
							 
						 
						
							
							
								
								New authorization  
							
							
							
						 
						
							2013-08-21 13:42:29 +08:00  
				
					
						
							
							
								 
						
							
								d24bd176cc 
								
							 
						 
						
							
							
								
								Changes in datetimepicker to accepts formats in options  
							
							
							
						 
						
							2013-08-21 13:42:29 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								897ed49d2e 
								
							 
						 
						
							
							
								
								new ui for faq and announcement status fixed.  
							
							
							
						 
						
							2013-08-20 18:22:11 +08:00  
				
					
						
							
							
								 
						
							
								21a7b5da5c 
								
							 
						 
						
							
							
								
								Icons for sidebar  
							
							
							
						 
						
							2013-08-19 17:13:36 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								b004121187 
								
							 
						 
						
							
							
								
								minimize bar updated to new style and more flexible.  
							
							
							
						 
						
							2013-08-19 12:59:57 +08:00  
				
					
						
							
							
								 
						
							
								bc596614fb 
								
							 
						 
						
							
							
								
								fixed pagnination errors for ask,qa,survey module  
							
							
							
						 
						
							2013-08-19 10:16:53 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								88ad59f55a 
								
							 
						 
						
							
							
								
								title and css fix for file view  
							
							
							
						 
						
							2013-08-19 09:42:50 +08:00  
				
					
						
							
							
								 
						
							
								7dfd5d7e00 
								
							 
						 
						
							
							
								
								Generate Breadcrumb for only for modules where module_apps are clearly defined  
							
							
							
						 
						
							2013-08-19 09:39:45 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								bbb765c88d 
								
							 
						 
						
							
							
								
								small fix for file link inside edit form for desktop  
							
							
							
						 
						
							2013-08-16 15:49:12 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								6577885761 
								
							 
						 
						
							
							
								
								docx xlsx and pptx file types fixed plus icon provided in edit form for files  
							
							
							
						 
						
							2013-08-16 15:49:04 +08:00  
				
					
						
							
							
								 
						
							
								a12e538932 
								
							 
						 
						
							
							
								
								new ui member show plugin profile translation fix  
							
							
							
						 
						
							2013-08-14 17:21:40 +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  
				
					
						
							
							
								 
						
							
								cb070cc537 
								
							 
						 
						
							
							
								
								Updated Desktop with fix for forms for all users  
							
							
							
						 
						
							2013-08-13 11:51:59 +08:00  
				
					
						
							
							
								 
						
							
								6c514770bc 
								
							 
						 
						
							
							
								
								solved conflict for member_new_ui  
							
							
							
						 
						
							2013-08-12 15:40:34 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								9c7558847a 
								
							 
						 
						
							
							
								
								bilingual fixed for all the plugins in desktop  
							
							
							
						 
						
							2013-08-12 12:28:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								771ec0b8f6 
								
							 
						 
						
							
							
								
								css fixed for plugins and types and also some other css problem fixed  
							
							
							
						 
						
							2013-08-12 12:28:51 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								d0ef862f85 
								
							 
						 
						
							
							
								
								language changes and conferences add/edit bug fixed  
							
							
							
						 
						
							2013-08-12 12:28:46 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								b2c3beefe9 
								
							 
						 
						
							
							
								
								icons and colors for themes fixed  
							
							
							
						 
						
							2013-08-12 12:28:39 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								55670e6318 
								
							 
						 
						
							
							
								
								icons and theme minicolors fixed  
							
							
							
						 
						
							2013-08-12 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								76d25882e8 
								
							 
						 
						
							
							
								
								Added Rake task to update desktop users to new_ui  
							
							
							
						 
						
							2013-08-09 18:44:43 +08:00  
				
					
						
							
							
								 
						
							
								6269c6d1e6 
								
							 
						 
						
							
							
								
								Updated init.rb  
							
							
							
						 
						
							2013-08-09 15:22:12 +08:00  
				
					
						
							
							
								 
						
							
								7c64e8c637 
								
							 
						 
						
							
							
								
								Updated AdBanner index page and Ad Image index page, and edit pages  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/ad_banner/config/locales/en.yml
	vendor/built_in_modules/ad_banner/init.rb 
							
						 
						
							2013-08-09 15:22:06 +08:00  
				
					
						
							
							
								 
						
							
								e14cb3c74c 
								
							 
						 
						
							
							
								
								Updated adimage home page  
							
							
							
						 
						
							2013-08-09 15:22:00 +08:00  
				
					
						
							
							
								 
						
							
								a2e9aa2e0b 
								
							 
						 
						
							
							
								
								Updated ADBanner with fixes on index page, ADImage with fixes  
							
							... 
							
							
							
							Conflicts:
	app/views/admin/ad_banners/index.html.erb
	app/views/admin/ad_images/_form.html.erb
	vendor/built_in_modules/ad_banner/init.rb 
							
						 
						
							2013-08-09 15:21:51 +08:00  
				
					
						
							
							
								 
						
							
								a5c800d3fe 
								
							 
						 
						
							
							
								
								Added video widget to new UI  
							
							
							
						 
						
							2013-08-09 10:46:16 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								0b6ace4e26 
								
							 
						 
						
							
							
								
								ok for precompiling  
							
							
							
						 
						
							2013-08-07 15:03:08 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e3d9966f76 
								
							 
						 
						
							
							
								
								bugs fixed for plugins. .. and also css fixed  
							
							
							
						 
						
							2013-08-06 17:53:04 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								7d288b4160 
								
							 
						 
						
							
							
								
								some changes in file selection  
							
							
							
						 
						
							2013-08-06 17:52:50 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c2f223b82c 
								
							 
						 
						
							
							
								
								new plugins added for desktop  
							
							
							
						 
						
							2013-08-06 17:52:39 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								42615f02ea 
								
							 
						 
						
							
							
								
								new feature in desktop for uploading wallpapers or putting url link  
							
							
							
						 
						
							2013-08-02 19:32:41 +08:00  
				
					
						
							
							
								 
						
							
								0f3a8414be 
								
							 
						 
						
							
							
								
								Delete duplicate js and css  
							
							... 
							
							
							
							Close the form in search in orbit bar 
							
						 
						
							2013-07-31 17:30:53 +08:00  
				
					
						
							
							
								 
						
							
								d632439f80 
								
							 
						 
						
							
							
								
								Add class for Ray's check-box  
							
							... 
							
							
							
							Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation 
							
						 
						
							2013-07-31 00:08:15 +08:00  
				
					
						
							
							
								 
						
							
								b1755bdc80 
								
							 
						 
						
							
							
								
								Added Stock Backgrounds, Fixed production issue with desktop css  
							
							
							
						 
						
							2013-07-30 18:37:36 +08:00  
				
					
						
							
							
								 
						
							
								2fea428b67 
								
							 
						 
						
							
							
								
								Changed mongoid production back to test_site  
							
							
							
						 
						
							2013-07-30 17:17:17 +08:00  
				
					
						
							
							
								 
						
							
								7e67d389b9 
								
							 
						 
						
							
							
								
								Added new orbit bar to compatibility page  
							
							
							
						 
						
							2013-07-30 17:15:57 +08:00  
				
					
						
							
							
								 
						
							
								094c0f4314 
								
							 
						 
						
							
							
								
								Updated desktop compatibility to fix css paths  
							
							
							
						 
						
							2013-07-30 17:15:55 +08:00  
				
					
						
							
							
								 
						
							
								d9079d9d7c 
								
							 
						 
						
							
							
								
								Updated with icons, latest js and css for desktop  
							
							
							
						 
						
							2013-07-30 16:43:47 +08:00  
				
					
						
							
							
								 
						
							
								aeaec79a2c 
								
							 
						 
						
							
							
								
								new themes, apps and widgets for new ui  
							
							
							
						 
						
							2013-07-30 16:43:44 +08:00  
				
					
						
							
							
								 
						
							
								e12b14311e 
								
							 
						 
						
							
							
								
								Updated Desktop with new UI  
							
							
							
						 
						
							2013-07-30 16:43:41 +08:00  
				
					
						
							
							
								 
						
							
								55d9aea664 
								
							 
						 
						
							
							
								
								Merged Desktop with New UI  
							
							
							
						 
						
							2013-07-30 16:43:38 +08:00  
				
					
						
							
							
								
									
								
								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  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								6d89eab98a 
								
							 
						 
						
							
							
								
								desktop final fix  
							
							
							
						 
						
							2013-07-30 16:43:28 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c18a8a8c6f 
								
							 
						 
						
							
							
								
								mongoid yml fix  
							
							
							
						 
						
							2013-07-30 16:43:22 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								38194311ab 
								
							 
						 
						
							
							
								
								some changes again  
							
							
							
						 
						
							2013-07-30 16:43:18 +08:00