Bernie Chiu
|
40b9448a0e
|
Merge branch '1017_ntu_ga_rss' of https://github.com/Rulingcom/orbit into 1017_ntu_ga_rss
|
2013-11-22 17:42:51 +08:00 |
|
Bernie Chiu
|
849cfa2076
|
Subscribe selection fix
|
2013-11-22 17:42:11 +08:00 |
thomaschen
|
3cce5ef8e5
|
Merge branch '1017_ntu_ga_rss' of https://github.com/Rulingcom/orbit into 1017_ntu_ga_rss
|
2013-11-22 17:21:18 +08:00 |
|
thomaschen
|
813fbc64cd
|
fix lib: can fetch rss feed from selected categories
|
2013-11-22 17:20:39 +08:00 |
|
Bernie Chiu
|
d07b8f4c09
|
Add Dynamic selection
|
2013-11-22 17:18:04 +08:00 |
|
thomaschen
|
9d3ee5b963
|
fix checkbox naming
|
2013-11-22 16:06:08 +08:00 |
|
thomaschen
|
a93cb71d86
|
add feed category mutilple checkbox
|
2013-11-22 15:49:45 +08:00 |
|
thomaschen
|
9de2778869
|
fix layout in english version & delete useless routes
|
2013-11-22 14:25:18 +08:00 |
|
Bernie Chiu
|
cb78427866
|
Add category selection for subscription
|
2013-11-20 17:01:51 +08:00 |
|
Bernie Chiu
|
9933db4fb5
|
Modify layout
|
2013-11-20 15:16:48 +08:00 |
|
thomaschen
|
3445cb8e69
|
create a hash rss site list from mongodb
|
2013-11-18 17:38:11 +08:00 |
|
thomaschen
|
c807d8a290
|
delete unuse lib file
|
2013-11-15 17:25:01 +08:00 |
|
thomaschen
|
2677e0a6a5
|
fix name
|
2013-11-15 17:23:06 +08:00 |
|
thomaschen
|
2663b6f45f
|
dynamic rss sites from AnnouncementFeed
|
2013-11-15 17:15:27 +08:00 |
|
thomaschen
|
e6b10fbfbd
|
add feed module(ntu_ga announcement rss feed module)
|
2013-11-15 16:34:37 +08:00 |
|
Bernie Chiu
|
d73f1ac565
|
Fix resque scheduler errror
|
2013-11-13 15:38:09 +08:00 |
|
Bernie Chiu
|
e6257a95a4
|
Fix model field naming
|
2013-11-13 15:05:25 +08:00 |
|
Bernie Chiu
|
4666057748
|
Add RSS source link and site info
|
2013-11-13 15:03:03 +08:00 |
|
Bernie Chiu
|
d10b647661
|
Add resque job for NTU GA Announcemnet feed
|
2013-11-12 17:35:54 +08:00 |
|
Bernie Chiu
|
22b95d4b22
|
Fix ntu_ga sites aggregate
|
2013-11-12 15:09:57 +08:00 |
|
Bernie Chiu
|
6d6650042e
|
Add script for NTU GA for grabbing all the bulletins
|
2013-11-08 17:42:48 +08:00 |
|
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 |