rulingcom
|
852166dabb
|
Addded export feature in Survey_b, By Spen
|
2013-10-11 11:45:52 +08:00 |
Bernie Chiu
|
9ed824d615
|
Merge branch '0913_ntu_ga_co' into 0913_ntu_ga_primary
|
2013-10-11 11:30:01 +08:00 |
thomaschen
|
6607f6b66e
|
roll back
|
2013-10-04 17:22:02 +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 |
chris
|
ae79694b44
|
Survey b
|
2013-09-13 15:43:34 +08:00 |
|
chris
|
7c398ce4fe
|
Changes for NTU General Affairs
|
2013-09-13 15:10:27 +08:00 |
|
chris
|
d766eea9f4
|
Changes for NTU common
Conflicts:
lib/tasks/migrate.rake
Conflicts:
lib/tasks/migrate.rake
Conflicts:
config/resque_schedule.yml
lib/tasks/migrate.rake
|
2013-09-13 15:10:10 +08:00 |
Matt K. Fu
|
473baa9b95
|
add backup job
|
2013-08-27 15:59:17 +08:00 |
Matthew K. Fu JuYuan
|
079b9145c3
|
move all *.god to *.erb so the God init won't go wrong
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
3102a46219
|
remove useless setting for solar
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
653a098ab6
|
fix solr setting
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
426edea485
|
add god to watch solr service
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
2e5b2555c6
|
from now on the rescue namespace will be decided by site object field: resque_namespace
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
2593707d8c
|
fix rescue scheduler space error
|
2013-08-27 15:59:15 +08:00 |
saurabhbhatia
|
a1eae7543e
|
Updated ask module with a new captcha plugin
|
2013-08-15 11:50:21 +08:00 |
|
saurabhbhatia
|
8d9bf62909
|
final mongoid fix
|
2013-07-31 14:22:40 +08:00 |
|
saurabhbhatia
|
2f480c31bf
|
Fixed mongoid
|
2013-07-31 13:54:29 +08:00 |
|
saurabhbhatia
|
36c3635bbb
|
add youtube videos module
|
2013-07-31 13:52:05 +08:00 |
|
chris
|
fa51d16879
|
Remove space causing error in rake
|
2013-07-19 19:23:25 +08:00 |
Spen
|
7d6df11873
|
email send cron & send logs for any apps
|
2013-07-19 17:01:54 +08:00 |
|
Matt K. Fu
|
8043573370
|
fix delay impressionist for tags and pages
|
2013-07-19 17:00:38 +08:00 |
|
Matt K. Fu
|
869f3b6815
|
fix object de-authorize failed.
|
2013-06-26 12:28:00 +08:00 |
 Harry Bomrah
|
300de76c3a
|
Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.
|
2013-06-26 12:25:58 +08:00 |
|
chris
|
b674f47528
|
Remove Syslog
|
2013-06-14 15:30:22 +08:00 |
|
Matt K. Fu
|
e20df41db5
|
add user log link at site page
|
2013-06-14 15:24:04 +08:00 |
iCross
|
110eab0496
|
ask module: add global smtp setting
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
8541033ba9
|
ask module: send mail on development
|
2013-06-07 13:04:00 +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
|
5ea0c5bd5c
|
survey module: result chart display only other
Conflicts:
config/environments/production.rb
|
2013-06-06 18:45:29 +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 |
|
chris
|
253cca06cc
|
New widget for tag cloud
|
2013-06-06 17:17:45 +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
|
37aa950028
|
user action
|
2013-05-23 11:55:57 +08:00 |
|
Matt K. Fu
|
ef2c732d2e
|
make blank site working better
|
2013-05-14 11:26:35 +08:00 |
|
Matt K. Fu
|
88d55989de
|
change logger
|
2013-05-14 10:29:11 +08:00 |
|
Matt K. Fu
|
7d077a92a5
|
system preference
|
2013-04-29 15:23:15 +08:00 |
|
Matt K. Fu
|
3e567223e3
|
fix for Spen's translation and Chris's tag error
|
2013-04-26 15:37:27 +08:00 |
|
Spen
|
79ef86f2c9
|
member translation fix
|
2013-04-26 11:26:11 +08:00 |
|
Matt K. Fu
|
2945e14385
|
use rack gridfs
|
2013-04-25 20:37:13 +08:00 |
|
Spen
|
697944a029
|
user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
|
2013-04-25 19:59:59 +08:00 |
|
Matt K. Fu
|
12e39b4d77
|
fix rescue job won't start
|
2013-04-25 15:46:16 +08:00 |
|
Matt K. Fu
|
b198b1a17b
|
system preference
|
2013-04-24 19:21:11 +08:00 |
|
Matt K. Fu
|
62fa589e8a
|
add msg when user session expired at page admin
|
2013-04-24 11:58:48 +08:00 |
|
Matt K. Fu
|
5ff7dfbac6
|
fronted open switch and backend openness
|
2013-04-23 18:48:18 +08:00 |
|
Matt K. Fu
|
fcfdd562a6
|
reverse harrys db setting
|
2013-04-17 14:29:56 +08:00 |
|
Harry Bomrah
|
e2802d94d0
|
rake task added
|
2013-04-17 14:28:13 +08:00 |
|
Matt K. Fu
|
0781779ac0
|
solved conflicts
|
2013-04-17 14:14:24 +08:00 |