Matt K. Fu
|
d78e816b4e
|
from now on the rescue namespace will be decided by site object field: resque_namespace
|
2013-06-19 15:45:53 +08:00 |
|
Matt K. Fu
|
e10eb833ed
|
fix rescue scheduler space error
|
2013-06-19 15:43:02 +08:00 |
Matthew K. Fu JuYuan
|
d3f0a10187
|
fix default setting for partial category selection error,due to API changing.
|
2013-06-17 15:26:43 +08:00 |
|
Matthew K. Fu JuYuan
|
256c51a970
|
add sold setting back
|
2013-06-17 13:45:30 +08:00 |
chris
|
b674f47528
|
Remove Syslog
|
2013-06-14 15:30:22 +08:00 |
|
chris
|
c1bd135595
|
Fix sortable when there's no record
|
2013-06-14 15:26:12 +08:00 |
iCross
|
96fc5ceea3
|
survey module: ensure the commit
|
2013-06-14 15:25:58 +08:00 |
|
iCross
|
e48a1ffece
|
archive module: add sort to frontend module
Conflicts:
vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
Conflicts:
vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
|
2013-06-14 15:25:49 +08:00 |
|
Matt K. Fu
|
e20df41db5
|
add user log link at site page
|
2013-06-14 15:24:04 +08:00 |
|
chris
|
e68793afc3
|
Fix tag delete
|
2013-06-14 15:23:45 +08:00 |
|
iCross
|
2f7389ae24
|
ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p>
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
110eab0496
|
ask module: add global smtp setting
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
ccd760445d
|
ask module: configure resque redis and namespace by config/initializers/resque.rb
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
c7effcc96c
|
ask module: create.js.erb
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
f3e1f4057d
|
ask module update css
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
e353961b21
|
ask moudule: add ask.css
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
75e27ed849
|
ask module: default status
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
8541033ba9
|
ask module: send mail on development
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
467c2e8a3c
|
ask module: fix
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
b0640f925b
|
ask module: fix some
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
841fa10c55
|
ask module: add rescue ackknowledgement
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
dcc5fc39a7
|
ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
|
2013-06-07 13:03:59 +08:00 |
|
iCross
|
97df100c64
|
remove department
|
2013-06-07 13:03:59 +08:00 |
|
iCross
|
ce180839f0
|
finish ask module
|
2013-06-07 13:03:59 +08:00 |
|
chris
|
0904978292
|
Remove non resolved conflict
|
2013-06-07 13:02:47 +08:00 |
|
iCross
|
ddd9a9668e
|
Merge branch 'lukas/picked_archive' into development
|
2013-06-06 23:12:30 +08:00 |
|
iCross
|
a468b69013
|
archive module: fix old data caused error
|
2013-06-06 23:11:24 +08:00 |
|
iCross
|
b6c8a88b73
|
Merge branch 'lukas/picked_archive' into development
|
2013-06-06 22:27:08 +08:00 |
|
iCross
|
5b7ac1a22b
|
archive module: add sort feature to achive files
|
2013-06-06 22:20:27 +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
|
f9a148c901
|
survey module: move down/up i18n
Conflicts:
vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
|
2013-06-06 18:46:52 +08:00 |
|
iCross
|
5ea0c5bd5c
|
survey module: result chart display only other
Conflicts:
config/environments/production.rb
|
2013-06-06 18:45:29 +08:00 |
|
iCross
|
d2f131d160
|
survey module: update css
Conflicts:
app/assets/stylesheets/questionnaire.css
|
2013-06-06 18:43:28 +08:00 |
|
iCross
|
8d71c377f2
|
fix datepicker helper hidden field value
|
2013-06-06 18:42:26 +08:00 |
|
iCross
|
ec173c4ce1
|
fix
|
2013-06-06 18:42:12 +08:00 |
|
iCross
|
ba7d6558ee
|
fix
|
2013-06-06 18:42:00 +08:00 |
|
iCross
|
88c57e0b0c
|
fix
|
2013-06-06 18:41:48 +08:00 |
|
iCross
|
d4962d20b3
|
fix
|
2013-06-06 18:41:36 +08:00 |
|
iCross
|
21bf3a0ccd
|
standalone css and icon
|
2013-06-06 18:41:27 +08:00 |
|
iCross
|
cf0d7cfc64
|
new export csv table
Conflicts:
vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
|
2013-06-06 18:40:28 +08:00 |
|
iCross
|
15347f25dc
|
fix
|
2013-06-06 18:38:59 +08:00 |
|
iCross
|
443d1c4fbe
|
csv stats & required start
|
2013-06-06 18:38:47 +08:00 |
|
iCross
|
7ba0977e16
|
stuff
Conflicts:
vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/show.html.erb
|
2013-06-06 18:38:22 +08:00 |
|
iCross
|
531cee70d2
|
fix
|
2013-06-06 18:31:28 +08:00 |
|
Lukas
|
b659c7021d
|
bug fix and add feature
|
2013-06-06 18:31:09 +08:00 |
|
Lukas
|
515185d87c
|
ques: fix submit
|
2013-06-06 18:30:54 +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 |
|
Lukas
|
32c259ac9e
|
survey: remain stuff
|
2013-06-06 18:27:05 +08:00 |