Commit Graph

3136 Commits

Author SHA1 Message Date
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
thomaschen 5e05f5d02b Merge branch '0913_ntu_ga_co' of https://github.com/Rulingcom/orbit into 0913_ntu_ga_co 2013-10-04 17:22:33 +08:00
thomaschen 6607f6b66e roll back 2013-10-04 17:22:02 +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 5432238816 merge 2013-09-27 15:07:19 +08:00
thomaschen 4e12c0bb5b (test)remote ip 2013-09-27 15:04:35 +08:00
Bernie Chiu d68f324ca3 Merge 2013-09-27 14:46:18 +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
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
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
Bernie Chiu 21009961ef Fix status bugs 2013-09-17 16:16:37 +08:00
Bernie Chiu 1edc134691 Add back mongoid yml 2013-09-17 12:07:41 +08:00
Bernie Chiu e89615a6f3 Fix naming error 2013-09-17 12:02:35 +08:00
thomaschen 0c29701f9b test 2013-09-16 15:07:50 +08:00
thomaschen 580be0b34b fix frontend ask_category error 2013-09-16 15:05:08 +08:00
Manson Wang cb0f126aad Fixed bugs and some modification in module "survey_b" 2013-09-13 15:43:34 +08:00
chris ae79694b44 Survey b 2013-09-13 15:43:34 +08:00
Bernie Chiu c361a7a201 Fix check box selections appearance
Conflicts:
	vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb
2013-09-13 15:43:14 +08:00
thomaschen b7bf180df2 fix frontend ask_category error 2013-09-13 15:43:14 +08:00
Bernie Chiu 71dad22b04 Add dynamic checkboxes
Conflicts:
	vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb
2013-09-13 15:43:14 +08:00
thomaschen 883496ede1 add multi deliver request 2013-09-13 15:43:14 +08:00
Bernie Chiu 0a1ebf18e3 Add check box array 2013-09-13 15:43:13 +08:00
thomaschen 3f9cdec426 add option for dep_dns 2013-09-13 15:43:13 +08:00
thomaschen 24b9f4015b add checkboxes for 11 dep in edit view 2013-09-13 15:43:13 +08:00
thomaschen 1237a111ca add transfered_category if not exist. change transfered reply's status to 待處理(轉). showing request code if error. 2013-09-13 15:43:13 +08:00
Bernie Chiu 64e14d42e2 Allow ask_question transter 2013-09-13 15:43:13 +08:00
thomaschen cc7a4ffb6d add response(temp) 2013-09-13 15:43:13 +08:00
Bernie Chiu da40c2b669 Allow sending request and getting response 2013-09-13 15:43:13 +08:00
thomaschen bf5416095e add auth_request route and controller 2013-09-13 15:43:13 +08:00
Bernie Chiu 8cd27e26e2 Fixed untracked files
Conflicts:
	config/mongoid.yml
2013-09-13 15:43:13 +08:00
thomaschen d98d008806 add sending post request function 2013-09-13 15:43:13 +08:00