18a1701472 
								
							 
						 
						
							
							
								
								Fixed Default Locale  
							
							
							
						 
						
							2013-11-29 21:37:25 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								b10a2edc22 
								
							 
						 
						
							
							
								
								redirects are ok now  
							
							... 
							
							
							
							Conflicts:
	app/controllers/application_controller.rb
	app/controllers/confirmations_controller.rb 
							
						 
						
							2013-11-29 18:52:57 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								f1c2e29bf1 
								
							 
						 
						
							
							
								
								form validations and ajax check plus user approval done  
							
							
							
						 
						
							2013-11-29 16:40:46 +08:00  
				
					
						
							
							
								 
						
							
								1584eeaf27 
								
							 
						 
						
							
							
								
								Updated Production Settings with Sendgrid  
							
							
							
						 
						
							2013-11-29 16:39:27 +08:00  
				
					
						
							
							
								 
						
							
								9347cd0463 
								
							 
						 
						
							
							
								
								Rake task for confirming and approving existing users  
							
							
							
						 
						
							2013-11-29 13:06:36 +08:00  
				
					
						
							
							
								 
						
							
								ea6909a6b0 
								
							 
						 
						
							
							
								
								Mailer now working in production added scope for pending users  
							
							
							
						 
						
							2013-11-29 12:03:16 +08:00  
				
					
						
							
							
								 
						
							
								9bc79fddd7 
								
							 
						 
						
							
							
								
								Email confirmation for user working  
							
							
							
						 
						
							2013-11-29 09:26:52 +08:00  
				
					
						
							
							
								 
						
							
								6d5dd4a80f 
								
							 
						 
						
							
							
								
								Changed Site Valid Locales to In Use Locales  
							
							
							
						 
						
							2013-11-27 17:51:48 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								8d7e350c32 
								
							 
						 
						
							
							
								
								facebook login and import done  
							
							
							
						 
						
							2013-11-27 09:46:02 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								73b82bc177 
								
							 
						 
						
							
							
								
								second commit for harry.tp  
							
							
							
						 
						
							2013-11-27 09:46:00 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								12127a8d6c 
								
							 
						 
						
							
							
								
								commit for harry.tp  
							
							
							
						 
						
							2013-11-27 09:45:57 +08:00  
				
					
						
							
							
								 
						
							
								dead52d8ab 
								
							 
						 
						
							
							
								
								Changes in Registration Process  
							
							
							
						 
						
							2013-11-25 17:05:36 +08:00  
				
					
						
							
							
								 
						
							
								03957f565b 
								
							 
						 
						
							
							
								
								Added Mobile Web as a separate page  
							
							
							
						 
						
							2013-11-25 12:43:23 +08:00  
				
					
						
							
							
								 
						
							
								35ce0fda6e 
								
							 
						 
						
							
							
								
								Enable Mobile Added to Site preferences  
							
							
							
						 
						
							2013-11-20 16:21:05 +08:00  
				
					
						
							
							
								 
						
							
								fbb0bf6e04 
								
							 
						 
						
							
							
								
								Changed config/sunspot.yml to be compatible with sunspot v2.1.0  
							
							
							
						 
						
							2013-11-19 16:58:37 +08:00  
				
					
						
							
							
								 
						
							
								c545c6f172 
								
							 
						 
						
							
							
								
								API for Locations  
							
							
							
						 
						
							2013-11-19 16:24:15 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								4888195566 
								
							 
						 
						
							
							
								
								more button works according to categories  
							
							
							
						 
						
							2013-11-15 22:35:20 +08:00  
				
					
						
							
							
								 
						
							
								ce8e9c0a5f 
								
							 
						 
						
							
							
								
								Revert "more button fix and also new way to select more page."  
							
							... 
							
							
							
							This reverts commit e129b25554 
							
						 
						
							2013-11-15 16:58:27 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e129b25554 
								
							 
						 
						
							
							
								
								more button fix and also new way to select more page.  
							
							
							
						 
						
							2013-11-15 15:13:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								f91c08ce4b 
								
							 
						 
						
							
							
								
								color added to location categories.  
							
							
							
						 
						
							2013-11-12 16:45:42 +08:00  
				
					
						
							
							
								 
						
							
								528f7d28b9 
								
							 
						 
						
							
							
								
								theaterurk fix  
							
							
							
						 
						
							2013-11-12 12:20:36 +08:00  
				
					
						
							
							
								 
						
							
								5e0696890a 
								
							 
						 
						
							
							
								
								Updated Remember me, and Homepage widget more link  
							
							
							
						 
						
							2013-11-11 17:23:03 +08:00  
				
					
						
							
							
								 
						
							
								72a37afddb 
								
							 
						 
						
							
							
								
								announcment fixed for frontend  
							
							
							
						 
						
							2013-11-08 17:37:55 +08:00  
				
					
						
							
							
								 
						
							
								b1867dd47a 
								
							 
						 
						
							
							
								
								new code logic for saving tree.. should work fine even if the node positions fail  
							
							
							
						 
						
							2013-11-04 22:20:50 +08:00  
				
					
						
							
							
								 
						
							
								7ad05ef034 
								
							 
						 
						
							
							
								
								Dashboard with Google Chart  
							
							
							
						 
						
							2013-11-04 17:48:51 +08:00  
				
					
						
							
							
								 
						
							
								d636248073 
								
							 
						 
						
							
							
								
								Updated Sidebar, Application Controllers  
							
							
							
						 
						
							2013-11-01 16:42:39 +08:00  
				
					
						
							
							
								 
						
							
								a885313e75 
								
							 
						 
						
							
							
								
								Dashboard with HighChart  
							
							
							
						 
						
							2013-10-30 18:23:46 +08:00  
				
					
						
							
							
								 
						
							
								a14d69211b 
								
							 
						 
						
							
							
								
								PagePart widgets for "system widget"  
							
							... 
							
							
							
							Delete useless code 
							
						 
						
							2013-10-28 16:29:23 +08:00  
				
					
						
							
							
								 
						
							
								218cb03641 
								
							 
						 
						
							
							
								
								PagePart widgets except "system widget"  
							
							
							
						 
						
							2013-10-28 16:29:23 +08:00  
				
					
						
							
							
								 
						
							
								f3b3c94b42 
								
							 
						 
						
							
							
								
								Item control iframe dom  
							
							... 
							
							
							
							Css for preview 
							
						 
						
							2013-10-26 18:58:53 +08:00  
				
					
						
							
							
								 
						
							
								13da6fc6a1 
								
							 
						 
						
							
							
								
								Added a new rake task with arguments  
							
							
							
						 
						
							2013-10-25 21:59:03 +08:00  
				
					
						
							
							
								 
						
							
								8ebfac2b99 
								
							 
						 
						
							
							
								
								Structure link with json  
							
							
							
						 
						
							2013-10-23 18:39:40 +08:00  
				
					
						
							
							
								 
						
							
								a4d1c68299 
								
							 
						 
						
							
							
								
								Structure page with json  
							
							
							
						 
						
							2013-10-23 18:39:35 +08:00  
				
					
						
							
							
								 
						
							
								c76adc1896 
								
							 
						 
						
							
							
								
								new ui member account privilege fix  
							
							
							
						 
						
							2013-10-21 10:42:50 +08:00  
				
					
						
							
							
								 
						
							
								92d2af13f2 
								
							 
						 
						
							
							
								
								changes for ad_banner  
							
							
							
						 
						
							2013-10-19 19:17:04 +08:00  
				
					
						
							
							
								 
						
							
								68a379f8a4 
								
							 
						 
						
							
							
								
								Some fixes for tags: authorization, translation…  
							
							... 
							
							
							
							can_use now takes all the open_for into account 
							
						 
						
							2013-10-19 19:14:31 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								14d2b0cc76 
								
							 
						 
						
							
							
								
								fix new ui member account privilege  
							
							
							
						 
						
							2013-10-18 19:52:36 +08:00  
				
					
						
							
							
								 
						
							
								3e491380cd 
								
							 
						 
						
							
							
								
								Revert "new ui member settings account data"  
							
							... 
							
							
							
							This reverts commit e1f4ee464b 
							
						 
						
							2013-10-18 19:51:02 +08:00  
				
					
						
							
							
								 
						
							
								e1f4ee464b 
								
							 
						 
						
							
							
								
								new ui member settings account data  
							
							
							
						 
						
							2013-10-18 19:12:27 +08:00  
				
					
						
							
							
								 
						
							
								14fea3638f 
								
							 
						 
						
							
							
								
								Updated with some locale fixes in site preferences  
							
							
							
						 
						
							2013-10-18 15:26:41 +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  
				
					
						
							
							
								 
						
							
								4120be6f8e 
								
							 
						 
						
							
							
								
								fixes in sitemap, site preference  
							
							
							
						 
						
							2013-10-14 16:48:50 +08:00  
				
					
						
							
							
								 
						
							
								55fa1cef4f 
								
							 
						 
						
							
							
								
								Added Enable and disable terms of use, sitemap  
							
							
							
						 
						
							2013-10-11 13:14:37 +00:00  
				
					
						
							
							
								 
						
							
								cf7f7aa29c 
								
							 
						 
						
							
							
								
								Fix tag page slide issues  
							
							
							
						 
						
							2013-10-08 12:47:31 +08:00  
				
					
						
							
							
								 
						
							
								21db2a2cba 
								
							 
						 
						
							
							
								
								Drag and drop to reorder users  
							
							
							
						 
						
							2013-10-07 15:53:54 +08:00  
				
					
						
							
							
								 
						
							
								f81894af90 
								
							 
						 
						
							
							
								
								User ordering  
							
							... 
							
							
							
							Run the task new_ui:save_users 
							
						 
						
							2013-09-26 19:00:13 +08:00  
				
					
						
							
							
								 
						
							
								dc3593c162 
								
							 
						 
						
							
							
								
								zh-tw for new ui  
							
							
							
						 
						
							2013-09-26 17:13:17 +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  
				
					
						
							
							
								 
						
							
								bb8bc9a529 
								
							 
						 
						
							
							
								
								Added missing translation for gallery  
							
							
							
						 
						
							2013-09-12 10:10:37 +08:00