saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d3565daef4
								
							
						 | 
						
							
							
								
								Added a rule for submanager to allow to edit announcement once authorized
							
							
							
							
							
						 | 
						
							2013-12-10 15:00:06 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								44cd8854a9
								
							
						 | 
						
							
							
								
								Removed approval from announcements
							
							
							
							
							
						 | 
						
							2013-12-10 10:31:14 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fd560935cd
								
							
						 | 
						
							
							
								
								Fixed the order of the fields in responsive settings page
							
							
							
							
							
						 | 
						
							2013-12-10 10:17:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								51f170589f
								
							
						 | 
						
							
							
								
								now we can set two colors gradient for orbit bar
							
							
							
							
							
						 | 
						
							2013-12-10 09:58:58 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								513a8e3c20
								
							
						 | 
						
							
							
								
								Rescued Nil
							
							
							
							
							
						 | 
						
							2013-12-09 16:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ba8ce81195
								
							
						 | 
						
							
							
								
								corrected wrong field name in the front end
							
							
							
							
							
						 | 
						
							2013-12-09 15:47:29 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								64e3830673
								
							
						 | 
						
							
							
								
								frontend with mobile bar color
							
							
							
							
							
						 | 
						
							2013-12-09 15:43:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								c8c51e7c6f
								
							
						 | 
						
							
							
								
								Mobile Color Bar is array now.
							
							
							
							
							
						 | 
						
							2013-12-09 15:23:40 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6f397868ec
								
							
						 | 
						
							
							
								
								Added field for colour setting
							
							
							
							
							
						 | 
						
							2013-12-09 15:18:11 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e15cf5cfca
								
							
						 | 
						
							
							
								
								Added Mobile Site Icon for the website
							
							
							
							
							
						 | 
						
							2013-12-09 14:54:36 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								050f2dedff
								
							
						 | 
						
							
							
								
								Fixed browser locale issue occuring due to zh
							
							
							
							
							
						 | 
						
							2013-12-09 12:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								b1936fcae9
								
							
						 | 
						
							
							
								
								Fixed backup locale and browser locale
							
							
							
							
							
						 | 
						
							2013-12-09 12:06:19 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								88260d59e7
								
							
						 | 
						
							
							
								
								fix for default locale
							
							
							
							
							
						 | 
						
							2013-12-09 11:10:55 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								87c3090784
								
							
						 | 
						
							
							
								
								Fixed Language issue with browser language
							
							
							
							
							
						 | 
						
							2013-12-06 17:17:39 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								3bb1baf013
								
							
						 | 
						
							
							
								
								Phone number display in mobile site
							
							
							
							
							
						 | 
						
							2013-12-06 17:00:43 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e145f4e4a9
								
							
						 | 
						
							
							
								
								Fixed asset precompile
							
							
							
							
							
						 | 
						
							2013-12-05 19:11:28 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d8cf721a5b
								
							
						 | 
						
							
							
								
								rescue added for the previous feature
							
							
							
							
							
						 | 
						
							2013-12-05 17:30:41 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9db4c787c9
								
							
						 | 
						
							
							
								
								approve and delete all done with registration approval notification for admin
							
							
							
							
							
						 | 
						
							2013-12-05 17:30:33 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								0eb8e1a305
								
							
						 | 
						
							
							
								
								Add phone number and address, dynamic map to mobile site
							
							
							
							
							
						 | 
						
							2013-12-05 17:27:30 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								947c907f73
								
							
						 | 
						
							
							
								
								Fixed Mobile Site
							
							
							
							
							
						 | 
						
							2013-12-04 18:07:27 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								62bc66ab07
								
							
						 | 
						
							
							
								
								Added Rake task to update announcement category field
							
							
							
							
							
						 | 
						
							2013-12-04 17:54:47 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								23071a364d
								
							
						 | 
						
							
							
								
								Site rescue nil
							
							
							
							
							
						 | 
						
							2013-12-04 17:48:23 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								53a51cc796
								
							
						 | 
						
							
							
								
								Removed unnecessary code
							
							
							
							
							
						 | 
						
							2013-12-04 17:13:02 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								7f4d4ae93f
								
							
						 | 
						
							
							
								
								Announcement Categories in Mobile settings
							
							
							
							
							
						 | 
						
							2013-12-04 17:12:25 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								2b4fa96b74
								
							
						 | 
						
							
							
								
								No email for user if added by admin
							
							
							
							
							
						 | 
						
							2013-12-04 14:38:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								4b169cf2e0
								
							
						 | 
						
							
							
								
								Fix desktop nil theme bug and approval for new user
							
							
							
							
							
						 | 
						
							2013-12-04 13:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fda0abdd25
								
							
						 | 
						
							
							
								
								Updated production settings
							
							
							
							
							
						 | 
						
							2013-12-04 11:54:00 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								a09133b164
								
							
						 | 
						
							
							
								
								removed announcement category from responsive setting page
							
							
							
							
							
						 | 
						
							2013-12-04 11:46:03 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9f3042c4fe
								
							
						 | 
						
							
							
								
								Fix for mailer
							
							
							
							
							
						 | 
						
							2013-12-04 11:42:39 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e87c678eb7
								
							
						 | 
						
							
							
								
								Channel Videos Mobile Sites Partial
							
							
							
							
							
						 | 
						
							2013-12-03 15:50:27 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								888f41a959
								
							
						 | 
						
							
							
								
								Added condition for default locale present
							
							
							
							
							
						 | 
						
							2013-12-02 14:30:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d0d6a4147e
								
							
						 | 
						
							
							
								
								Fixed Default Locale
							
							
							
							
							
						 | 
						
							2013-12-02 13:24:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								a433f4f9a4
								
							
						 | 
						
							
							
								
								Fix site preference page
							
							
							
							
							
						 | 
						
							2013-12-02 12:33:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								d1c532e8f4
								
							
						 | 
						
							
							
								
								Fix site setting default-language changing effect
							
							
							
							
							
						 | 
						
							2013-12-02 12:15:42 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8c4d6b972a
								
							
						 | 
						
							
							
								
								minor fix for emailers and facebook
							
							
							
							
							
						 | 
						
							2013-12-02 12:10:17 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								685f696536
								
							
						 | 
						
							
							
								
								Added Sendgrid details for production
							
							
							
							
							
						 | 
						
							2013-12-02 10:42:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9defe109fd
								
							
						 | 
						
							
							
								
								Removed Default Locale rake task
							
							
							
							
							
						 | 
						
							2013-11-29 21:41:31 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								18a1701472
								
							
						 | 
						
							
							
								
								Fixed Default Locale
							
							
							
							
							
						 | 
						
							2013-11-29 21:37:25 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								7cfd9080e8
								
							
						 | 
						
							
							
								
								correct signup workflow
							
							
							
							
							
						 | 
						
							2013-11-29 19:00:32 +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 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ee1246caa4
								
							
						 | 
						
							
							
								
								Added rake for default locale
							
							
							
							
							
						 | 
						
							2013-11-29 18:51:18 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6e9c21781c
								
							
						 | 
						
							
							
								
								Confirmations Workflow working
							
							
							
							
							
						 | 
						
							2013-11-29 18:46:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f1c2e29bf1
								
							
						 | 
						
							
							
								
								form validations and ajax check plus user approval done
							
							
							
							
							
						 | 
						
							2013-11-29 16:40:46 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								1584eeaf27
								
							
						 | 
						
							
							
								
								Updated Production Settings with Sendgrid
							
							
							
							
							
						 | 
						
							2013-11-29 16:39:27 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9347cd0463
								
							
						 | 
						
							
							
								
								Rake task for confirming and approving existing users
							
							
							
							
							
						 | 
						
							2013-11-29 13:06:36 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								f4be776697
								
							
						 | 
						
							
							
								
								added after confirmation path
							
							
							
							
							
						 | 
						
							2013-11-29 12:31:50 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ea6909a6b0
								
							
						 | 
						
							
							
								
								Mailer now working in production added scope for pending users
							
							
							
							
							
						 | 
						
							2013-11-29 12:03:16 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9260c3d2b7
								
							
						 | 
						
							
							
								
								Add Approval to User
							
							
							
							
							
						 | 
						
							2013-11-29 10:52:29 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9bc79fddd7
								
							
						 | 
						
							
							
								
								Email confirmation for user working
							
							
							
							
							
						 | 
						
							2013-11-29 09:26:52 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								38b2d02d92
								
							
						 | 
						
							
							
								
								Email added to Signup Form
							
							
							
							
							
						 | 
						
							2013-11-28 18:06:14 +08:00 |