Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								70c3afed01
								
							
						 | 
						
							
							
								
								Fix annoucement FB share link
							
							
							
							
							
						 | 
						
							2013-11-14 11:40:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								926102bf72
								
							
						 | 
						
							
							
								
								Fix module web_resource front_end display skip blank title
							
							
							
							
							
						 | 
						
							2013-09-25 19:21:42 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1b5f6a79c7
								
							
						 | 
						
							
							
								
								widget link fixed on homepage
							
							
							
							
							
						 | 
						
							2013-09-25 17:50:37 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								eb8495bcbd
								
							
						 | 
						
							
							
								
								widget code rewritten for gallery master branch
							
							
							
							
							
						 | 
						
							2013-09-25 16:39:00 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								71e8b3c042
								
							
						 | 
						
							
							
								
								Change get_item
							
							
							
							
							
							
							
							Add category and tags to default widget link to object 
							
						 | 
						
							2013-07-19 18:39:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								8043573370
								
							
						 | 
						
							
							
								
								fix delay impressionist for tags and pages
							
							
							
							
							
						 | 
						
							2013-07-19 17:00:38 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b1d8a87256
								
							
						 | 
						
							
							
								
								frontend gallery fix
							
							
							
							
							
						 | 
						
							2013-07-18 21:22:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								ceac2b842c
								
							
						 | 
						
							
							
								
								fix impression page counter
							
							
							
							
							
						 | 
						
							2013-07-18 12:04:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c763817ebf
								
							
						 | 
						
							
							
								
								Fix web link front end index and widget index
							
							
							
							
							
						 | 
						
							2013-07-17 17:54:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								837dc3ea7b
								
							
						 | 
						
							
							
								
								announcement init default_widget add a style & field
							
							
							
							
							
						 | 
						
							2013-07-17 11:31:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								ea5d89e0e1
								
							
						 | 
						
							
							
								
								make announcement widget amount start from 1
							
							
							
							
							
						 | 
						
							2013-07-16 18:19:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d996b91b54
								
							
						 | 
						
							
							
								
								preview by default widget
							
							
							
							
							
						 | 
						
							2013-07-15 17:09:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								07b3857465
								
							
						 | 
						
							
							
								
								archive app Category Authorization fix
							
							
							
							
							
						 | 
						
							2013-06-26 17:44:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								8751b15385
								
							
						 | 
						
							
							
								
								archive app add Module Authorization & Category Authorization
							
							
							
							
							
						 | 
						
							2013-06-26 15:35:35 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								465d417c35
								
							
						 | 
						
							
							
								
								fixed updated method of events.. was having week error when updating events
							
							
							
							
							
						 | 
						
							2013-06-26 12:27:23 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								eaf7577810
								
							
						 | 
						
							
							
								
								small syntax error missed out yesterday fixed.
							
							
							
							
							
						 | 
						
							2013-06-26 12:26:52 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								22358bd862
								
							
						 | 
						
							
							
								
								Small change for creating events when calendar is not selected
							
							
							
							
							
						 | 
						
							2013-06-26 12:26:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								300de76c3a
								
							
						 | 
						
							
							
								
								Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
							
							
							
							
							
						 | 
						
							2013-06-26 12:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								96fc5ceea3
								
							
						 | 
						
							
							
								
								survey module: ensure the commit
							
							
							
							
							
						 | 
						
							2013-06-14 15:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								e48a1ffece
								
							
						 | 
						
							
							
								
								archive module: add sort to frontend module
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb 
							
						 | 
						
							2013-06-14 15:25:49 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								2f7389ae24
								
							
						 | 
						
							
							
								
								ask module change mail view: <p>此為系統自動發信,請勿直接回覆</p>
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								c7effcc96c
								
							
						 | 
						
							
							
								
								ask module: create.js.erb
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 |