 Harry Bomrah
|
2c24e788b0
|
fixed frontend
|
2013-07-23 18:32:24 +08:00 |
chris
|
26a8be2f0f
|
Fix bulletins_controller.rb missing 'end'
|
2013-07-19 19:52:44 +08:00 |
|
Harry Bomrah
|
1357124f6f
|
backend theater for ie fixed
|
2013-07-19 18:40:19 +08:00 |
|
Harry Bomrah
|
8c3fb43bf5
|
theater view fixed in IE
|
2013-07-19 18:40:09 +08:00 |
|
chris
|
71e8b3c042
|
Change get_item
Add category and tags to default widget link to object
|
2013-07-19 18:39:13 +08:00 |
Matt K. Fu
|
8043573370
|
fix delay impressionist for tags and pages
|
2013-07-19 17:00:38 +08:00 |
|
Harry Bomrah
|
b1d8a87256
|
frontend gallery fix
|
2013-07-18 21:22:23 +08:00 |
|
Matt K. Fu
|
ceac2b842c
|
fix impression page counter
|
2013-07-18 12:04:37 +08:00 |
|
chris
|
c763817ebf
|
Fix web link front end index and widget index
|
2013-07-17 17:54:34 +08:00 |
Spen
|
837dc3ea7b
|
announcement init default_widget add a style & field
|
2013-07-17 11:31:38 +08:00 |
|
Matt K. Fu
|
ea5d89e0e1
|
make announcement widget amount start from 1
|
2013-07-16 18:19:20 +08:00 |
Matthew K. Fu JuYuan
|
d996b91b54
|
preview by default widget
|
2013-07-15 17:09:48 +08:00 |
|
Spen
|
07b3857465
|
archive app Category Authorization fix
|
2013-06-26 17:44:31 +08:00 |
|
Spen
|
8751b15385
|
archive app add Module Authorization & Category Authorization
|
2013-06-26 15:35:35 +08:00 |
|
Harry Bomrah
|
465d417c35
|
fixed updated method of events.. was having week error when updating events
|
2013-06-26 12:27:23 +08:00 |
|
Harry Bomrah
|
eaf7577810
|
small syntax error missed out yesterday fixed.
|
2013-06-26 12:26:52 +08:00 |
|
Harry Bomrah
|
22358bd862
|
Small change for creating events when calendar is not selected
|
2013-06-26 12:26:24 +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 |
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 |
|
iCross
|
2f7389ae24
|
ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p>
|
2013-06-07 13:04:00 +08:00 |
|
iCross
|
c7effcc96c
|
ask module: create.js.erb
|
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 |
|
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
|
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 |
|
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 |