chris
							
						 
						
							 
							
							
							
							
								
							
							
								f694134150 
								
							 
						 
						
							
							
								
								Remove useless code  
							
							 
							
							... 
							
							
							
							Add data-title 
							
						 
						
							2013-10-19 19:14:07 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								00e9a5df5b 
								
							 
						 
						
							
							
								
								new ui member settings account data  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb 
							
						 
						
							2013-10-18 22:28:27 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								32c1defba0 
								
							 
						 
						
							
							
								
								Updated Site Preferences Templates  
							
							 
							
							
							
						 
						
							2013-10-18 20:03:58 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								14d2b0cc76 
								
							 
						 
						
							
							
								
								fix new ui member account privilege  
							
							 
							
							
							
						 
						
							2013-10-18 19:52:36 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								3e491380cd 
								
							 
						 
						
							
							
								
								Revert "new ui member settings account data"  
							
							 
							
							... 
							
							
							
							This reverts commit e1f4ee464b . 
							
						 
						
							2013-10-18 19:51:02 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								e1f4ee464b 
								
							 
						 
						
							
							
								
								new ui member settings account data  
							
							 
							
							
							
						 
						
							2013-10-18 19:12:27 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								14fea3638f 
								
							 
						 
						
							
							
								
								Updated with some locale fixes in site preferences  
							
							 
							
							
							
						 
						
							2013-10-18 15:26:41 +08:00  
						
					 
				
					
						
							
							
								 
								Manson Wang
							
						 
						
							 
							
							
							
							
								
							
							
								a67be030c5 
								
							 
						 
						
							
							
								
								Fix JS Path  
							
							 
							
							
							
						 
						
							2013-10-17 11:21:46 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								d2459f42c0 
								
							 
						 
						
							
							
								
								Added Favicon and default image for orbitbar  
							
							 
							
							
							
						 
						
							2013-10-16 18:50:22 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								155039ac16 
								
							 
						 
						
							
							
								
								Updated fixes for site info - desktop openess, title always displayed  
							
							 
							
							
							
						 
						
							2013-10-16 18:33:57 +08:00  
						
					 
				
					
						
							
							
								 
								Manson Wang
							
						 
						
							 
							
							
							
							
								
							
							
								2bcecc322e 
								
							 
						 
						
							
							
								
								Update Ad_Banner for new jQuery  
							
							 
							
							... 
							
							
							
							Removed loading module.js in module_widget.html.erb 
							
						 
						
							2013-10-16 12:28:21 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								df5cda7a98 
								
							 
						 
						
							
							
								
								new feature added for not loading submenus inside api for desktop  
							
							 
							
							
							
						 
						
							2013-10-16 09:37:39 +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  
						
					 
				
					
						
							
							
								 
								Manson Wang
							
						 
						
							 
							
							
							
							
								
							
							
								11b880752d 
								
							 
						 
						
							
							
								
								Fix Ad_Banner backend refresh page after edit banner  
							
							 
							
							
							
						 
						
							2013-10-15 19:50:01 +08:00  
						
					 
				
					
						
							
							
								 
								Manson Wang
							
						 
						
							 
							
							
							
							
								
							
							
								76ba7087b2 
								
							 
						 
						
							
							
								
								Fix Ad_Banner frontend for IE8  
							
							 
							
							... 
							
							
							
							Fix backend bug in editing banner
Translation Added 
							
						 
						
							2013-10-15 19:37:12 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								5fb3731430 
								
							 
						 
						
							
							
								
								Show Custom orbit bar icon only for frontend and desktop  
							
							 
							
							
							
						 
						
							2013-10-15 10:07:46 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								fb34dc673f 
								
							 
						 
						
							
							
								
								Changeable Orbitbar logo  
							
							 
							
							
							
						 
						
							2013-10-14 18:20:26 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								4120be6f8e 
								
							 
						 
						
							
							
								
								fixes in sitemap, site preference  
							
							 
							
							
							
						 
						
							2013-10-14 16:48:50 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								55fa1cef4f 
								
							 
						 
						
							
							
								
								Added Enable and disable terms of use, sitemap  
							
							 
							
							
							
						 
						
							2013-10-11 13:14:37 +00:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								5c8a57e700 
								
							 
						 
						
							
							
								
								Fixed Sitemap Toggle  
							
							 
							
							
							
						 
						
							2013-10-09 09:06:21 +00:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								315a24556c 
								
							 
						 
						
							
							
								
								Fix parser common to skip not found module_app  
							
							 
							
							... 
							
							
							
							Do not show default widget if there's no data 
							
						 
						
							2013-10-08 16:42:20 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								cf7f7aa29c 
								
							 
						 
						
							
							
								
								Fix tag page slide issues  
							
							 
							
							
							
						 
						
							2013-10-08 12:47:31 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								21db2a2cba 
								
							 
						 
						
							
							
								
								Drag and drop to reorder users  
							
							 
							
							
							
						 
						
							2013-10-07 15:53:54 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								1194bdd9b4 
								
							 
						 
						
							
							
								
								Updated Sitemap with UI fixes - checkbox tag pending  
							
							 
							
							
							
						 
						
							2013-10-07 15:05:50 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								940a915125 
								
							 
						 
						
							
							
								
								Updated Sitemap with new UI  
							
							 
							
							
							
						 
						
							2013-10-07 09:43:47 +08:00  
						
					 
				
					
						
							
							
								 
								Manson Wang
							
						 
						
							 
							
							
							
							
								
							
							
								792785f7ba 
								
							 
						 
						
							
							
								
								Fix relation for Ad_banner and Ad_image  
							
							 
							
							... 
							
							
							
							Update site.rake for New UI 
							
						 
						
							2013-10-04 19:20:04 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								ba8da9b6bb 
								
							 
						 
						
							
							
								
								Updated button class in template form  
							
							 
							
							
							
						 
						
							2013-10-04 14:41:48 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								ff93670949 
								
							 
						 
						
							
							
								
								Updated template editing  
							
							 
							
							
							
						 
						
							2013-10-04 14:41:31 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								08907aa8c1 
								
							 
						 
						
							
							
								
								Search Engine Preferences complete  
							
							 
							
							
							
						 
						
							2013-10-02 15:23:12 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								433c8d5da6 
								
							 
						 
						
							
							
								
								Fix link in category for authorization, fix update of auth users  
							
							 
							
							
							
						 
						
							2013-10-02 12:18:20 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								9bdb633157 
								
							 
						 
						
							
							
								
								Updated with UI Changes  
							
							 
							
							
							
						 
						
							2013-10-01 17:39:21 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								0a9fd6a4b5 
								
							 
						 
						
							
							
								
								some needed changes in api for desktop  
							
							 
							
							
							
						 
						
							2013-09-30 16:59:50 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								9186978551 
								
							 
						 
						
							
							
								
								new ui member plugin sort fix and user show avatar fix  
							
							 
							
							
							
						 
						
							2013-09-27 11:04:52 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								622534e5db 
								
							 
						 
						
							
							
								
								Fix user order:  
							
							 
							
							... 
							
							
							
							- gender color
 - add cancel button for input 
							
						 
						
							2013-09-26 20:18:34 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								52c896d8c5 
								
							 
						 
						
							
							
								
								some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.  
							
							 
							
							
							
						 
						
							2013-09-26 20:11:45 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								f81894af90 
								
							 
						 
						
							
							
								
								User ordering  
							
							 
							
							... 
							
							
							
							Run the task new_ui:save_users 
							
						 
						
							2013-09-26 19:00:13 +08:00  
						
					 
				
					
						
							
							
								 
								Manson Wang
							
						 
						
							 
							
							
							
							
								
							
							
								16c26e3273 
								
							 
						 
						
							
							
								
								Fix path of jquery.cycle.all.latest.js  
							
							 
							
							
							
						 
						
							2013-09-26 16:11:08 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								1d0ea6718f 
								
							 
						 
						
							
							
								
								brief added to desktop for all plugins  
							
							 
							
							
							
						 
						
							2013-09-25 18:23:44 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								a067bcd304 
								
							 
						 
						
							
							
								
								Add Brief intro. for all personal plugins  
							
							 
							
							... 
							
							
							
							Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix 
							
						 
						
							2013-09-18 18:55:40 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								8456a91968 
								
							 
						 
						
							
							
								
								Fix structure edit  
							
							 
							
							
							
						 
						
							2013-09-14 17:26:16 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								789e02e313 
								
							 
						 
						
							
							
								
								ad_banner banner load fixed for test site  
							
							 
							
							
							
						 
						
							2013-09-13 14:23:44 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								8c98645a69 
								
							 
						 
						
							
							
								
								small bug fix for inserting and delete button.  
							
							 
							
							
							
						 
						
							2013-09-11 14:03:19 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								9e10a3c944 
								
							 
						 
						
							
							
								
								editing for the assets are done with replacable files and description  
							
							 
							
							
							
						 
						
							2013-09-11 14:03:13 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								f920a4f6ba 
								
							 
						 
						
							
							
								
								filemanager and some update for file uploader . added file uploader to kernel  
							
							 
							
							
							
						 
						
							2013-09-11 14:03:06 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								865be29b37 
								
							 
						 
						
							
							
								
								Updated Preference Page  
							
							 
							
							
							
						 
						
							2013-09-09 11:29:46 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								0eeb7db1a8 
								
							 
						 
						
							
							
								
								Updated preference UI  
							
							 
							
							
							
						 
						
							2013-09-09 11:02:58 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								7216676c40 
								
							 
						 
						
							
							
								
								Updated Sidebar and Preferences  
							
							 
							
							
							
						 
						
							2013-09-09 10:18:14 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								fa857cfeea 
								
							 
						 
						
							
							
								
								Default Locale  
							
							 
							
							
							
						 
						
							2013-09-06 18:00:36 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								a3f1b8d54a 
								
							 
						 
						
							
							
								
								Updated Preferences in Site Info  
							
							 
							
							
							
						 
						
							2013-09-06 18:00:30 +08:00  
						
					 
				
					
						
							
							
								 
								saurabhbhatia
							
						 
						
							 
							
							
							
							
								
							
							
								e9d6fa8787 
								
							 
						 
						
							
							
								
								Preference Page  
							
							 
							
							
							
						 
						
							2013-09-06 18:00:28 +08:00