Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d089822ff3
								
							
						 | 
						
							
							
								
								fixed updated method of events.. was having week error when updating events
							
							
							
							
							
						 | 
						
							2013-06-20 12:47:44 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								777af19abb
								
							
						 | 
						
							
							
								
								small syntax error missed out yesterday fixed.
							
							
							
							
							
						 | 
						
							2013-06-20 11:55:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								07e895fc42
								
							
						 | 
						
							
							
								
								Small change for creating events when calendar is not selected
							
							
							
							
							
						 | 
						
							2013-06-19 17:27:13 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								80bf3499be
								
							
						 | 
						
							
							
								
								Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
							
							
							
							
							
						 | 
						
							2013-06-19 17:16:52 +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 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								e353961b21
								
							
						 | 
						
							
							
								
								ask moudule: add ask.css
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								75e27ed849
								
							
						 | 
						
							
							
								
								ask module: default status
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								8541033ba9
								
							
						 | 
						
							
							
								
								ask module: send mail on development
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								467c2e8a3c
								
							
						 | 
						
							
							
								
								ask module: fix
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								b0640f925b
								
							
						 | 
						
							
							
								
								ask module: fix some
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								841fa10c55
								
							
						 | 
						
							
							
								
								ask module: add rescue ackknowledgement
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								dcc5fc39a7
								
							
						 | 
						
							
							
								
								ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
							
							
							
							
							
						 | 
						
							2013-06-07 13:03:59 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								97df100c64
								
							
						 | 
						
							
							
								
								remove department
							
							
							
							
							
						 | 
						
							2013-06-07 13:03:59 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								ce180839f0
								
							
						 | 
						
							
							
								
								finish ask module
							
							
							
							
							
						 | 
						
							2013-06-07 13:03:59 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								b6c8a88b73
								
							
						 | 
						
							
							
								
								Merge branch 'lukas/picked_archive' into development
							
							
							
							
							
						 | 
						
							2013-06-06 22:27:08 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								5b7ac1a22b
								
							
						 | 
						
							
							
								
								archive module: add sort feature to achive files
							
							
							
							
							
						 | 
						
							2013-06-06 22:20:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								d5109c837c
								
							
						 | 
						
							
							
								
								Merge branch 'lukas/picked_ques' into development
							
							
							
							
							
						 | 
						
							2013-06-06 19:59:30 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								c63ac751ea
								
							
						 | 
						
							
							
								
								archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb
							
							
							
							
							
						 | 
						
							2013-06-06 19:20:21 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								8c1e65994a
								
							
						 | 
						
							
							
								
								Merge branch 'clean_development' into lukas/picked_ques
							
							
							
							
							
						 | 
						
							2013-06-06 19:08:59 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								f9a148c901
								
							
						 | 
						
							
							
								
								survey module: move down/up i18n
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb 
							
						 | 
						
							2013-06-06 18:46:52 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								5ea0c5bd5c
								
							
						 | 
						
							
							
								
								survey module: result chart display only other
							
							
							
							
							
							
							
							Conflicts:
	config/environments/production.rb 
							
						 | 
						
							2013-06-06 18:45:29 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								ec173c4ce1
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2013-06-06 18:42:12 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								ba7d6558ee
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2013-06-06 18:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								88c57e0b0c
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2013-06-06 18:41:48 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								d4962d20b3
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2013-06-06 18:41:36 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								21bf3a0ccd
								
							
						 | 
						
							
							
								
								standalone css and icon
							
							
							
							
							
						 | 
						
							2013-06-06 18:41:27 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								cf0d7cfc64
								
							
						 | 
						
							
							
								
								new export csv table
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb 
							
						 | 
						
							2013-06-06 18:40:28 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								15347f25dc
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2013-06-06 18:38:59 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								443d1c4fbe
								
							
						 | 
						
							
							
								
								csv stats & required start
							
							
							
							
							
						 | 
						
							2013-06-06 18:38:47 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								7ba0977e16
								
							
						 | 
						
							
							
								
								stuff
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/show.html.erb 
							
						 | 
						
							2013-06-06 18:38:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								b659c7021d
								
							
						 | 
						
							
							
								
								bug fix and add feature
							
							
							
							
							
						 | 
						
							2013-06-06 18:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								515185d87c
								
							
						 | 
						
							
							
								
								ques: fix submit
							
							
							
							
							
						 | 
						
							2013-06-06 18:30:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								adc15951bb
								
							
						 | 
						
							
							
								
								questionnaire stuff
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb 
							
						 | 
						
							2013-06-06 18:29:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								32c259ac9e
								
							
						 | 
						
							
							
								
								survey: remain stuff
							
							
							
							
							
						 | 
						
							2013-06-06 18:27:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								51640423a7
								
							
						 | 
						
							
							
								
								survey module initial
							
							
							
							
							
						 | 
						
							2013-06-06 18:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7729161123
								
							
						 | 
						
							
							
								
								fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
							
							
							
							
							
						 | 
						
							2013-06-06 17:38:17 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								253cca06cc
								
							
						 | 
						
							
							
								
								New widget for tag cloud
							
							
							
							
							
						 | 
						
							2013-06-06 17:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								30824d1620
								
							
						 | 
						
							
							
								
								add search to archive
							
							
							
							
							
						 | 
						
							2013-06-05 18:03:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								54a35b30be
								
							
						 | 
						
							
							
								
								fix design index bug when start start from blank DB.
							
							
							
							
							
							
							
							add delay impressionist.
add several i18n vars 
							
						 | 
						
							2013-05-23 12:07:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3d0a1cef56
								
							
						 | 
						
							
							
								
								1.fix for syntax error.
							
							
							
							
							
							
							
							2.Making production console works.
3.Making blank site member no errors. 
							
						 | 
						
							2013-05-22 16:25:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								4a5256bf4f
								
							
						 | 
						
							
							
								
								ntu dropdown fix member staff css
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								5b368235e8
								
							
						 | 
						
							
							
								
								ntu dropdown fix list sort
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								b8da40b4ae
								
							
						 | 
						
							
							
								
								ntu_dropdown_fix
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c2331695cd
								
							
						 | 
						
							
							
								
								Set order of page context to match the order of structure
							
							
							
							
							
							
							
							Add some params to keep the sorting 
							
						 | 
						
							2013-05-07 11:15:30 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								127ab3845c
								
							
						 | 
						
							
							
								
								Changes for queries
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								167a71272a
								
							
						 | 
						
							
							
								
								queries need to be rethink
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								caf0426bd4
								
							
						 | 
						
							
							
								
								bulletin search
							
							
							
							
							
						 | 
						
							2013-05-01 12:16:28 +08:00 |