thomaschen
|
b68a413574
|
add front-end announcement feed controller(testing)
|
2013-11-08 12:20:55 +08:00 |
Spen
|
d1fd2b6984
|
fix app sub manager and ask verification code
|
2013-11-07 18:06:16 +08:00 |
|
Spen
|
8f25dc2871
|
fix ntu ga survey export
|
2013-11-04 10:00:54 +08:00 |
|
thomaschen
|
82988a2029
|
Fix front-end tag cloud search under category filters
|
2013-11-01 16:22:08 +08:00 |
|
thomaschen
|
e5fccb33bf
|
Fix tag cloud search under category filters
|
2013-11-01 15:38:49 +08:00 |
|
thomaschen
|
d832f4c4b1
|
can read the spreadsheet each row.(need to think of a method to parse each row to figure)
Conflicts:
Gemfile
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
|
2013-10-25 18:36:32 +08:00 |
|
thomaschen
|
59af75e50a
|
fix error
|
2013-10-25 18:21:17 +08:00 |
Bernie Chiu
|
67cd34ab27
|
Add oneline and multiline import
|
2013-10-25 18:21:17 +08:00 |
|
thomaschen
|
4a736cc92c
|
error fix
|
2013-10-25 18:21:17 +08:00 |
|
Bernie Chiu
|
9b96f2eeb0
|
Merge
Conflicts:
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
|
2013-10-25 18:21:07 +08:00 |
|
Bernie Chiu
|
74b89f1fac
|
Allow update answers on radio groups
Conflicts:
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
|
2013-10-25 18:09:55 +08:00 |
|
thomaschen
|
62e9acdbb8
|
fix error
|
2013-10-25 18:05:37 +08:00 |
|
thomaschen
|
4a897b68cf
|
merge
|
2013-10-25 18:05:37 +08:00 |
|
Bernie Chiu
|
d3fc6e5956
|
Add import on radiogroups on file change
|
2013-10-25 18:05:37 +08:00 |
|
Bernie Chiu
|
71acee200c
|
Fix encoding issue and add import on title change
|
2013-10-25 18:05:37 +08:00 |
|
thomaschen
|
63156c7a95
|
remove unuse variable and comment
|
2013-10-25 18:05:37 +08:00 |
|
thomaschen
|
5156701094
|
import 'check' and 'select' question success
|
2013-10-25 18:05:37 +08:00 |
|
thomaschen
|
1266cd1384
|
fix import-csv column error
|
2013-10-25 18:05:37 +08:00 |
|
thomaschen
|
f3f4dc842c
|
import radio question success
Conflicts:
Gemfile
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
|
2013-10-25 17:56:49 +08:00 |
|
Spen
|
13144f62fb
|
add ntu_ga survey init sorting
|
2013-10-18 18:17:05 +08:00 |
|
Bernie Chiu
|
6d951f8d9c
|
Add correct department links
|
2013-10-18 16:20:13 +08:00 |
|
Bernie Chiu
|
d0364c788b
|
Fix locale error
|
2013-10-17 18:23:33 +08:00 |
|
Bernie Chiu
|
e2ec8f134e
|
Add routing and links for import
|
2013-10-17 18:23:17 +08:00 |
|
Bernie Chiu
|
83a8433e52
|
Fix survey title link redirection after deadline
|
2013-10-17 18:22:54 +08:00 |
|
thomaschen
|
8f65da0a04
|
fix js hide localsite error
|
2013-10-17 18:22:41 +08:00 |
|
thomaschen
|
ad8bb72b07
|
fix uri parse problem
|
2013-10-17 18:22:11 +08:00 |
Manson Wang
|
06a8b9073e
|
Merge branch '0913_ntu_ga_co' of github.com:Rulingcom/orbit into 0913_ntu_ga
|
2013-10-17 18:21:41 +08:00 |
|
Spen
|
f9485c1f86
|
announcement init sorting fix
Conflicts:
vendor/built_in_modules/announcement/init.rb
|
2013-10-11 18:00:39 +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 |