saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4cd455441f
								
							
						 | 
						
							
							
								
								Updated location json visibility
							
							
							
							
							
						 | 
						
							2013-10-03 18:20:16 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fea0540ec3
								
							
						 | 
						
							
							
								
								updated json format for location and locaiton categories
							
							
							
							
							
						 | 
						
							2013-10-03 17:59:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								44f5a98a69
								
							
						 | 
						
							
							
								
								Updated Location and loction categories to pass ids
							
							
							
							
							
						 | 
						
							2013-10-03 17:30:05 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								746bcbed96
								
							
						 | 
						
							
							
								
								added get_categorywise_locations
							
							
							
							
							
						 | 
						
							2013-10-03 15:52:46 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ec6ef5a871
								
							
						 | 
						
							
							
								
								NTUE localtion categories as json for Android App
							
							
							
							
							
						 | 
						
							2013-10-03 15:06:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								051adbf167
								
							
						 | 
						
							
							
								
								ntue email_ers fix and announcement widget filed fix
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d386307745
								
							
						 | 
						
							
							
								
								Fix params name for rss
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								5c0d16c22e
								
							
						 | 
						
							
							
								
								Modification in rss feed for announcement:
							
							
							
							
							
							
							
							- subtitle instead of text
	- add rss link in the json for categories 
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ruling
							
						 | 
						
							
							
							
							
							
								
							
							
								93424e1972
								
							
						 | 
						
							
							
								
								Fix link frontend and gallery json
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3c49a6eeae
								
							
						 | 
						
							
							
								
								Do not show announcement in json and rss if no title in I18n.locale (fix 2)
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f76ead6ea5
								
							
						 | 
						
							
							
								
								Revert "Do not show announcement in json and rss if no title in I18n.locale (fix)"
							
							
							
							
							
							
							
							This reverts commit f72697ae76. 
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e8a8e92f5c
								
							
						 | 
						
							
							
								
								Do not show announcement in json and rss if no title in I18n.locale (fix)
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								5b60e389ec
								
							
						 | 
						
							
							
								
								Revert "Do not show announcement in json and rss if no title in I18n.locale"
							
							
							
							
							
							
							
							This reverts commit 03189092d3. 
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								faabedad55
								
							
						 | 
						
							
							
								
								Do not show announcement in json and rss if no title in I18n.locale
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d95b050e57
								
							
						 | 
						
							
							
								
								Changes to have both json and rss, add categories
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								afe6972dfa
								
							
						 | 
						
							
							
								
								link widget for ntue updated
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9fbf9e940e
								
							
						 | 
						
							
							
								
								Fix scope error
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								0f2c13e7ac
								
							
						 | 
						
							
							
								
								First version of new feed for announcement
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								f42d25c46b
								
							
						 | 
						
							
							
								
								ntue emailer approval fix and announcement widget add unit field
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dda603c27c
								
							
						 | 
						
							
							
								
								Changes for ntue (mail app)
							
							
							
							
							
						 | 
						
							2013-09-30 16:35:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6d4d3ccfd4
								
							
						 | 
						
							
							
								
								for some reason can_display has been remove from announcement init. add it back.
							
							
							
							
							
						 | 
						
							2013-09-23 16:29:22 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								141b708392
								
							
						 | 
						
							
							
								
								widget code rewritten for gallery master branch
							
							
							
							
							
						 | 
						
							2013-09-16 11:22:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								b3366b48a1
								
							
						 | 
						
							
							
								
								announcement add new widget bulletins_and_links
							
							
							
							
							
						 | 
						
							2013-09-13 13:39:39 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								36e7e3d3e8
								
							
						 | 
						
							
							
								
								Fixed Locale settings for location navigation
							
							
							
							
							
						 | 
						
							2013-09-13 12:44:13 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								06c2240d34
								
							
						 | 
						
							
							
								
								Categories working tested and added link to sidebar
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	config/mongoid.yml 
							
						 | 
						
							2013-09-13 12:43:42 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c4e8ed96a9
								
							
						 | 
						
							
							
								
								location category
							
							
							
							
							
						 | 
						
							2013-09-13 12:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								134b639465
								
							
						 | 
						
							
							
								
								fix announcement language
							
							
							
							
							
						 | 
						
							2013-09-09 17:35:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								45136f915d
								
							
						 | 
						
							
							
								
								fix news default widget shows un-checked bulletins.
							
							
							
							
							
						 | 
						
							2013-09-09 11:14:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								915ea066d6
								
							
						 | 
						
							
							
								
								fixing bulletin default widget
							
							
							
							
							
						 | 
						
							2013-09-02 17:24:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								e7aa7ea1fa
								
							
						 | 
						
							
							
								
								added sorting DSL
							
							
							
							
							
						 | 
						
							2013-09-02 16:33:50 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								b20955579e
								
							
						 | 
						
							
							
								
								Cleaned Up ask module for master
							
							
							
							
							
						 | 
						
							2013-08-27 14:29:59 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								1ebda22f0e
								
							
						 | 
						
							
							
								
								Updated with loader
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb
	vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb 
							
						 | 
						
							2013-08-27 14:29:53 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								c511aeb8de
								
							
						 | 
						
							
							
								
								Removed logging statements
							
							
							
							
							
						 | 
						
							2013-08-27 14:29:47 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								26d3a89d30
								
							
						 | 
						
							
							
								
								Updated ask module with custom acknowledgement working
							
							
							
							
							
						 | 
						
							2013-08-27 14:29:39 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								91f80a0952
								
							
						 | 
						
							
							
								
								Deleted ask
							
							
							
							
							
						 | 
						
							2013-08-27 14:29:28 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								f333fe9e21
								
							
						 | 
						
							
							
								
								Added custom acknowledgement to ask
							
							
							
							
							
						 | 
						
							2013-08-27 14:29:22 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								33f256bd16
								
							
						 | 
						
							
							
								
								Fix mailing redirect
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/ask/init.rb
	vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
	vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb
	vendor/built_in_modules/ask_new/config/routes.rb 
							
						 | 
						
							2013-08-19 13:03:49 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fde9fd7ffe
								
							
						 | 
						
							
							
								
								Deleted Unnecessary Old code in ask module and video
							
							
							
							
							
						 | 
						
							2013-08-15 12:12:38 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d977b83d06
								
							
						 | 
						
							
							
								
								Updated captcha, mailing function working
							
							
							
							
							
						 | 
						
							2013-08-15 11:50:28 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								a1eae7543e
								
							
						 | 
						
							
							
								
								Updated ask module with a new captcha plugin
							
							
							
							
							
						 | 
						
							2013-08-15 11:50:21 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								19d33f78bd
								
							
						 | 
						
							
							
								
								Updated Video with frontend widget and backend widget working
							
							
							
							
							
						 | 
						
							2013-07-31 13:52:24 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								37c91664d3
								
							
						 | 
						
							
							
								
								Updated with video widget
							
							
							
							
							
						 | 
						
							2013-07-31 13:52:22 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								eb853f773d
								
							
						 | 
						
							
							
								
								Updated video cleaned up the ui
							
							
							
							
							
						 | 
						
							2013-07-31 13:52:19 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d701d9d6ad
								
							
						 | 
						
							
							
								
								Updated videos module with widget initiation
							
							
							
							
							
						 | 
						
							2013-07-31 13:52:10 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								75eeec737c
								
							
						 | 
						
							
							
								
								Video and Channel Fetching now working
							
							
							
							
							
						 | 
						
							2013-07-31 13:52:07 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								36c3635bbb
								
							
						 | 
						
							
							
								
								add youtube videos module
							
							
							
							
							
						 | 
						
							2013-07-31 13:52:05 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2c24e788b0
								
							
						 | 
						
							
							
								
								fixed frontend
							
							
							
							
							
						 | 
						
							2013-07-23 18:32:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								26a8be2f0f
								
							
						 | 
						
							
							
								
								Fix bulletins_controller.rb missing 'end'
							
							
							
							
							
						 | 
						
							2013-07-19 19:52:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1357124f6f
								
							
						 | 
						
							
							
								
								backend theater for ie fixed
							
							
							
							
							
						 | 
						
							2013-07-19 18:40:19 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8c3fb43bf5
								
							
						 | 
						
							
							
								
								theater view fixed in IE
							
							
							
							
							
						 | 
						
							2013-07-19 18:40:09 +08:00 |