chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6d8698af63
								
							
						 | 
						
							
							
								
								Comment out included css from member front
							
							
							
							
							
						 | 
						
							2013-09-03 17:09:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								00ddd94314
								
							
						 | 
						
							
							
								
								fix design index
							
							
							
							
							
						 | 
						
							2013-09-03 15:20:48 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8045a18230
								
							
						 | 
						
							
							
								
								Change modal delete to take an "remote" option
							
							
							
							
							
						 | 
						
							2013-09-03 15:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								81a89d2d7c
								
							
						 | 
						
							
							
								
								new ui member image js fix
							
							
							
							
							
						 | 
						
							2013-09-02 14:37:35 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4209356e9d
								
							
						 | 
						
							
							
								
								new features in gallery image view.. and also tags for gallery completed.
							
							
							
							
							
						 | 
						
							2013-09-02 11:23:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								3123c5de0a
								
							
						 | 
						
							
							
								
								new ui member bug and interface fix
							
							
							
							
							
						 | 
						
							2013-09-02 11:22:17 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								82b6be483a
								
							
						 | 
						
							
							
								
								isotope embedded inside desktop kernel
							
							
							
							
							
						 | 
						
							2013-08-30 10:58:08 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ff64fb5230
								
							
						 | 
						
							
							
								
								file title translations fixed
							
							
							
							
							
						 | 
						
							2013-08-30 10:57:54 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								2bc9d3424a
								
							
						 | 
						
							
							
								
								Deleted unused module
							
							
							
							
							
						 | 
						
							2013-08-27 15:10:10 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								5591b06ee6
								
							
						 | 
						
							
							
								
								Ask Module for New UI
							
							
							
							
							
						 | 
						
							2013-08-27 12:38:06 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								b970ea1e0e
								
							
						 | 
						
							
							
								
								Updated Authorization for member, link, tag, archive
							
							
							
							
							
						 | 
						
							2013-08-27 10:14:39 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								155722519b
								
							
						 | 
						
							
							
								
								Module Auth for video
							
							
							
							
							
						 | 
						
							2013-08-23 15:22:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								45e987d6f5
								
							
						 | 
						
							
							
								
								Fix for authorization
							
							
							
							
							
							
							
							Dashboard and page authorisation 
							
						 | 
						
							2013-08-23 12:08:33 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								399dfad392
								
							
						 | 
						
							
							
								
								faq authorization completed.
							
							
							
							
							
						 | 
						
							2013-08-22 18:00:05 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								53e5c57970
								
							
						 | 
						
							
							
								
								Commented Dashboard Public Visibility and fall back on no-filter defined authorization
							
							
							
							
							
						 | 
						
							2013-08-22 16:43:11 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e75873273c
								
							
						 | 
						
							
							
								
								Updated Gallery with authorizations
							
							
							
							
							
						 | 
						
							2013-08-22 16:25:11 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4c217ec12f
								
							
						 | 
						
							
							
								
								Updated Authorizations for Adbanner, Calendar, Location
							
							
							
							
							
						 | 
						
							2013-08-22 15:20:50 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								452da1b8ec
								
							
						 | 
						
							
							
								
								Updated Desktop Themes controller
							
							
							
							
							
						 | 
						
							2013-08-22 14:14:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ec40591489
								
							
						 | 
						
							
							
								
								Make the filter for authorisation easier for developers
							
							
							
							
							
						 | 
						
							2013-08-22 12:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								4078d426a6
								
							
						 | 
						
							
							
								
								new ui personal front_end page(member app) & users_new_interface show sub_roles fix
							
							
							
							
							
						 | 
						
							2013-08-21 14:13:36 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c474fa063f
								
							
						 | 
						
							
							
								
								New authorization
							
							
							
							
							
						 | 
						
							2013-08-21 13:42:29 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								cb070cc537
								
							
						 | 
						
							
							
								
								Updated Desktop with fix for forms for all users
							
							
							
							
							
						 | 
						
							2013-08-13 11:51:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								76d25882e8
								
							
						 | 
						
							
							
								
								Added Rake task to update desktop users to new_ui
							
							
							
							
							
						 | 
						
							2013-08-09 18:44:43 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6269c6d1e6
								
							
						 | 
						
							
							
								
								Updated init.rb
							
							
							
							
							
						 | 
						
							2013-08-09 15:22:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e14cb3c74c
								
							
						 | 
						
							
							
								
								Updated adimage home page
							
							
							
							
							
						 | 
						
							2013-08-09 15:22:00 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								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 |