21db2a2cba 
								
							 
						 
						
							
							
								
								Drag and drop to reorder users  
							
							
							
						 
						
							2013-10-07 15:53:54 +08:00  
				
					
						
							
							
								 
						
							
								1194bdd9b4 
								
							 
						 
						
							
							
								
								Updated Sitemap with UI fixes - checkbox tag pending  
							
							
							
						 
						
							2013-10-07 15:05:50 +08:00  
				
					
						
							
							
								 
						
							
								940a915125 
								
							 
						 
						
							
							
								
								Updated Sitemap with new UI  
							
							
							
						 
						
							2013-10-07 09:43:47 +08:00  
				
					
						
							
							
								 
						
							
								792785f7ba 
								
							 
						 
						
							
							
								
								Fix relation for Ad_banner and Ad_image  
							
							... 
							
							
							
							Update site.rake for New UI 
							
						 
						
							2013-10-04 19:20:04 +08:00  
				
					
						
							
							
								 
						
							
								ba8da9b6bb 
								
							 
						 
						
							
							
								
								Updated button class in template form  
							
							
							
						 
						
							2013-10-04 14:41:48 +08:00  
				
					
						
							
							
								 
						
							
								ff93670949 
								
							 
						 
						
							
							
								
								Updated template editing  
							
							
							
						 
						
							2013-10-04 14:41:31 +08:00  
				
					
						
							
							
								 
						
							
								08907aa8c1 
								
							 
						 
						
							
							
								
								Search Engine Preferences complete  
							
							
							
						 
						
							2013-10-02 15:23:12 +08:00  
				
					
						
							
							
								 
						
							
								433c8d5da6 
								
							 
						 
						
							
							
								
								Fix link in category for authorization, fix update of auth users  
							
							
							
						 
						
							2013-10-02 12:18:20 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								9186978551 
								
							 
						 
						
							
							
								
								new ui member plugin sort fix and user show avatar fix  
							
							
							
						 
						
							2013-09-27 11:04:52 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f81894af90 
								
							 
						 
						
							
							
								
								User ordering  
							
							... 
							
							
							
							Run the task new_ui:save_users 
							
						 
						
							2013-09-26 19:00:13 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								865be29b37 
								
							 
						 
						
							
							
								
								Updated Preference Page  
							
							
							
						 
						
							2013-09-09 11:29:46 +08:00  
				
					
						
							
							
								 
						
							
								0eeb7db1a8 
								
							 
						 
						
							
							
								
								Updated preference UI  
							
							
							
						 
						
							2013-09-09 11:02:58 +08:00  
				
					
						
							
							
								 
						
							
								7216676c40 
								
							 
						 
						
							
							
								
								Updated Sidebar and Preferences  
							
							
							
						 
						
							2013-09-09 10:18:14 +08:00  
				
					
						
							
							
								 
						
							
								fa857cfeea 
								
							 
						 
						
							
							
								
								Default Locale  
							
							
							
						 
						
							2013-09-06 18:00:36 +08:00  
				
					
						
							
							
								 
						
							
								a3f1b8d54a 
								
							 
						 
						
							
							
								
								Updated Preferences in Site Info  
							
							
							
						 
						
							2013-09-06 18:00:30 +08:00  
				
					
						
							
							
								 
						
							
								e9d6fa8787 
								
							 
						 
						
							
							
								
								Preference Page  
							
							
							
						 
						
							2013-09-06 18:00:28 +08:00  
				
					
						
							
							
								 
						
							
								6e032a8757 
								
							 
						 
						
							
							
								
								Add Preference and search engine  
							
							
							
						 
						
							2013-09-06 18:00:23 +08:00  
				
					
						
							
							
								 
						
							
								1558cfdb4e 
								
							 
						 
						
							
							
								
								Updated Sitebar with Search Engine  
							
							
							
						 
						
							2013-09-06 18:00:21 +08:00  
				
					
						
							
							
								 
						
							
								9e4686a565 
								
							 
						 
						
							
							
								
								Fixed Site Info completely and added search engine page  
							
							
							
						 
						
							2013-09-06 18:00:18 +08:00  
				
					
						
							
							
								 
						
							
								fef7cc4ed2 
								
							 
						 
						
							
							
								
								Updated Site info  
							
							
							
						 
						
							2013-09-06 18:00:10 +08:00  
				
					
						
							
							
								 
						
							
								7f0821ea84 
								
							 
						 
						
							
							
								
								Updated Site info page to new ui  
							
							
							
						 
						
							2013-09-06 17:59:56 +08:00  
				
					
						
							
							
								 
						
							
								2c0761aafb 
								
							 
						 
						
							
							
								
								Updated Sitemap to New UI  
							
							
							
						 
						
							2013-09-06 17:59:54 +08:00  
				
					
						
							
							
								 
						
							
								1e5ad750cd 
								
							 
						 
						
							
							
								
								Updated Site bar with correct links  
							
							
							
						 
						
							2013-09-06 17:59:43 +08:00  
				
					
						
							
							
								 
						
							
								00ddd94314 
								
							 
						 
						
							
							
								
								fix design index  
							
							
							
						 
						
							2013-09-03 15:20:48 +08:00  
				
					
						
							
							
								 
						
							
								8045a18230 
								
							 
						 
						
							
							
								
								Change modal delete to take an "remote" option  
							
							
							
						 
						
							2013-09-03 15:04:05 +08:00  
				
					
						
							
							
								 
						
							
								3123c5de0a 
								
							 
						 
						
							
							
								
								new ui member bug and interface fix  
							
							
							
						 
						
							2013-09-02 11:22:17 +08:00  
				
					
						
							
							
								 
						
							
								e75873273c 
								
							 
						 
						
							
							
								
								Updated Gallery with authorizations  
							
							
							
						 
						
							2013-08-22 16:25:11 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7dfd5d7e00 
								
							 
						 
						
							
							
								
								Generate Breadcrumb for only for modules where module_apps are clearly defined  
							
							
							
						 
						
							2013-08-19 09:39:45 +08:00  
				
					
						
							
							
								 
						
							
								6c514770bc 
								
							 
						 
						
							
							
								
								solved conflict for member_new_ui  
							
							
							
						 
						
							2013-08-12 15:40:34 +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  
				
					
						
							
							
								
									
								
								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