saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fd24fbe082
								
							
						 | 
						
							
							
								
								Commit for Basic Site
							
							
							
							
							
						 | 
						
							2013-12-16 16:08:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								dccb9c75d8
								
							
						 | 
						
							
							
								
								Page Parts now working
							
							
							
							
							
						 | 
						
							2013-12-13 18:40:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Bernie Chiu
							
						 | 
						
							
							
							
							
							
								
							
							
								eb638995f0
								
							
						 | 
						
							
							
								
								Fix missing params category value
							
							
							
							
							
						 | 
						
							2013-12-13 16:19:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								e9a40774ac
								
							
						 | 
						
							
							
								
								Add phone numbers to mobile front_end
							
							
							
							
							
						 | 
						
							2013-12-12 17:59:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								afb5afeceb
								
							
						 | 
						
							
							
								
								Added multi-phone numbers in mobile setting page and fixed language setting
							
							
							
							
							
						 | 
						
							2013-12-12 16:07:27 +08:00 | 
						
					
				
					
						
							
							
								 
								rulingcom
							
						 | 
						
							
							
							
							
							
								
							
							
								4c85d62866
								
							
						 | 
						
							
							
								
								ray fix for css and filemanager
							
							
							
							
							
						 | 
						
							2013-12-12 15:39:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6c01d517d2
								
							
						 | 
						
							
							
								
								Fixed page data count
							
							
							
							
							
						 | 
						
							2013-12-12 12:49:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								85778224a1
								
							
						 | 
						
							
							
								
								Fixed langauge system tab
							
							
							
							
							
						 | 
						
							2013-12-12 10:24:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								053144dfa4
								
							
						 | 
						
							
							
								
								widget count fixed for new widgets in page widget settings
							
							
							
							
							
						 | 
						
							2013-12-11 19:37:39 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0671d0b126
								
							
						 | 
						
							
							
								
								filemanger authentication changes and also announcement preview fixed and also text search for files
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/assets/index.html.erb 
							
						 | 
						
							2013-12-11 18:49:54 +08:00 | 
						
					
				
					
						
							
							
								 
								rulingcom
							
						 | 
						
							
							
							
							
							
								
							
							
								a82022c958
								
							
						 | 
						
							
							
								
								ray fix design for filemanager
							
							
							
							
							
						 | 
						
							2013-12-11 17:59:14 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a02cd97880
								
							
						 | 
						
							
							
								
								file manger preview and pagination is done.
							
							
							
							
							
						 | 
						
							2013-12-11 14:41:08 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								800f108be3
								
							
						 | 
						
							
							
								
								added enabling and disabling feature of widget count in module init
							
							
							
							
							
						 | 
						
							2013-12-10 17:43:31 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								2a41e90bc1
								
							
						 | 
						
							
							
								
								Ray's fixes for the file manager
							
							
							
							
							
						 | 
						
							2013-12-10 17:40:13 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								6e9c21781c
								
							
						 | 
						
							
							
								
								Confirmations Workflow working
							
							
							
							
							
						 | 
						
							2013-11-29 18:46:07 +08:00 |