Commit Graph

1187 Commits

Author SHA1 Message Date
Bernie Chiu d0b68a4992 Add oneline and multiline import 2013-11-04 10:15:51 +08:00
thomaschen 555397ff3b error fix 2013-11-04 10:15:50 +08:00
Bernie Chiu 1f4502185c Merge
Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
2013-11-04 10:15:50 +08:00
Bernie Chiu 7b6b7e2bed Allow update answers on radio groups
Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
2013-11-04 10:15:50 +08:00
thomaschen d1d245d9ea fix error 2013-11-04 10:15:50 +08:00
thomaschen 0850d8f61a merge 2013-11-04 10:15:50 +08:00
Bernie Chiu a469643cde Add import on radiogroups on file change 2013-11-04 10:15:50 +08:00
Bernie Chiu 5e446bc37f Fix encoding issue and add import on title change 2013-11-04 10:15:50 +08:00
thomaschen e91386b393 remove unuse variable and comment 2013-11-04 10:15:50 +08:00
thomaschen 2ceb0167a5 import 'check' and 'select' question success 2013-11-04 10:15:50 +08:00
thomaschen c62d917048 fix import-csv column error 2013-11-04 10:15:50 +08:00
thomaschen db355d4d27 import radio question success
Conflicts:

	Gemfile
	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
2013-11-04 10:15:49 +08:00
Spen 5d7f83ed0e add ntu_ga survey init sorting 2013-10-18 18:35:09 +08:00
Bernie Chiu 39a9ad27a6 Add departments links for deployed server 2013-10-18 16:31:20 +08:00
Bernie Chiu 01ce52060b Fix locale error 2013-10-16 17:25:39 +08:00
Bernie Chiu 1e5fbfed5f Add routing and links for import 2013-10-16 17:03:18 +08:00
Spen 7e0657d983 fix survey_b result and export value ( float ) 2013-10-15 11:43:08 +08:00
Spen c9a235c802 announcement init sorting fix
Conflicts:

	vendor/built_in_modules/announcement/init.rb
2013-10-11 17:40:20 +08:00
Bernie Chiu 9ba943776e Fix survey title link redirection after deadline 2013-10-11 17:04:03 +08:00
thomaschen 9845854f3d fix js hide localsite error 2013-10-11 14:39:56 +08:00
thomaschen 8cab186b00 fix uri parse problem 2013-10-11 13:24:24 +08:00
rulingcom 852166dabb Addded export feature in Survey_b, By Spen 2013-10-11 11:45:52 +08:00
Bernie Chiu 6230bc3d36 Merge branch '0913_ntu_ga_primary' of https://github.com/Rulingcom/orbit into 0913_ntu_ga_primary 2013-10-11 11:32:01 +08:00
Bernie Chiu 9ed824d615 Merge branch '0913_ntu_ga_co' into 0913_ntu_ga_primary 2013-10-11 11:30:01 +08:00
Bernie Chiu 627425b72e Add port to test 2013-10-08 17:51:40 +08:00
Bernie Chiu 9cb2a5b211 Update values to test servers 2013-10-08 17:41:22 +08:00
Bernie Chiu 75f5404b7a Modify value to test servers 2013-10-08 17:36:03 +08:00
Bernie Chiu bd3a922073 Add local test server 2013-10-08 16:06:36 +08:00
Bernie Chiu 9fbb2917b1 Widget title without link 2013-10-08 12:24:34 +08:00
Bernie Chiu bd6d94a143 Comment out JavaScript redirect workaround 2013-10-04 17:48:58 +08:00
Bernie Chiu 8684388ab9 Reverse 2013-10-04 17:47:26 +08:00
Bernie Chiu 63fab74a25 Post form without ajax 2013-10-04 15:57:14 +08:00
Bernie Chiu 48969b70b5 Modify thank_you route 2013-10-04 14:08:18 +08:00
Bernie Chiu 88c8ca68d0 Add ask fail message and success redirect fix 2013-10-01 16:09:43 +08:00
Bernie Chiu 3eeda5410c Fix bugs 2013-09-27 17:15:49 +08:00
thomaschen 660960f316 fix first reply error 2013-09-27 17:03:09 +08:00
Bernie Chiu 696134aa18 Fix ip direct 2013-09-27 16:40:34 +08:00
Bernie Chiu 2777b92589 Test ip direct 2013-09-27 16:30:36 +08:00
thomaschen 4e12c0bb5b (test)remote ip 2013-09-27 15:04:35 +08:00
thomaschen 50f5d12da3 fix status error 2013-09-27 14:35:25 +08:00
thomaschen d635c892cf fix dns error 2013-09-27 11:22:37 +08:00
Manson Wang 6b85824a90 Fix module survey_b back_end button link 2013-09-25 19:47:23 +08:00
Bernie Chiu 26bc837c76 Modify fail definition 2013-09-25 17:53:35 +08:00
Bernie Chiu 8247f077df Change status based on your requests sent 2013-09-25 17:46:32 +08:00
Bernie Chiu 70de1cea9d Modify syntax 2013-09-25 14:55:02 +08:00
Bernie Chiu 0f18cdfe8e Skip invalid options 2013-09-25 14:46:55 +08:00
Manson Wang bad90e0abe Fix a word in module survey_b 2013-09-24 20:48:25 +08:00
thomaschen 0d1426cab8 add post request error checking and resend one more time 2013-09-23 12:46:59 +08:00
thomaschen b57b899dba fix naming error 2013-09-23 11:28:30 +08:00
Bernie Chiu 1305b9f1ef Rescue URI Error 2013-09-17 16:37:38 +08:00