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 |
|
Lukas
|
51640423a7
|
survey module initial
|
2013-06-06 18:26:41 +08:00 |
|
Matt K. Fu
|
dd206437d8
|
apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.
|
2013-06-06 17:39:36 +08:00 |
|
Matt K. Fu
|
7729161123
|
fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
|
2013-06-06 17:38:17 +08:00 |
Matthew K. Fu JuYuan
|
f2706ff2c1
|
make default widget work with params[tag_id] params[category_id]
|
2013-06-06 17:36:30 +08:00 |
|
Matthew K. Fu JuYuan
|
5c94200b77
|
fix argument passing problem for more link and tag cloud, incomplete code.
|
2013-06-06 17:21:27 +08:00 |
|
Matt K. Fu
|
6b8b749b0f
|
fix chris tag cloud
|
2013-06-06 17:18:42 +08:00 |
chris
|
253cca06cc
|
New widget for tag cloud
|
2013-06-06 17:17:45 +08:00 |
|
Matt K. Fu
|
30824d1620
|
add search to archive
|
2013-06-05 18:03:09 +08:00 |
|
Matt K. Fu
|
704db56925
|
fix bulletin data having 8 hours difference.
|
2013-06-05 18:01:57 +08:00 |
|
Matt K. Fu
|
06fd305bf9
|
default widget show search
|
2013-06-05 13:00:21 +08:00 |
|
Matt K. Fu
|
c0f1614cb9
|
fix uploading error due to user action decoder can not handle uploading file
|
2013-05-30 10:17:28 +08:00 |
|
Matt K. Fu
|
3e0b7d81ae
|
clean 403 404 500
|
2013-05-27 16:46:49 +08:00 |
|
Matt K. Fu
|
2806dd35a9
|
spen's fix for user
|
2013-05-23 14:03:18 +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
|
3d0a1cef56
|
1.fix for syntax error.
2.Making production console works.
3.Making blank site member no errors.
|
2013-05-22 16:25:12 +08:00 |
Spen
|
4a5256bf4f
|
ntu dropdown fix member staff css
|
2013-05-14 14:19:56 +08:00 |
|
Spen
|
5b368235e8
|
ntu dropdown fix list sort
|
2013-05-14 14:19:55 +08:00 |
|
Spen
|
b8da40b4ae
|
ntu_dropdown_fix
|
2013-05-14 14:19:55 +08:00 |
|
Matt K. Fu
|
287e77836d
|
fix css compiling error
|
2013-05-14 14:19:20 +08:00 |
|
Matt K. Fu
|
3e6c2b1ec2
|
fix member error with blank database
|
2013-05-14 11:48:13 +08:00 |
|
Matt K. Fu
|
f2247aab32
|
ray's css fix
|
2013-05-14 11:27:15 +08:00 |
|
Matt K. Fu
|
ef2c732d2e
|
make blank site working better
|
2013-05-14 11:26:35 +08:00 |
|
Matt K. Fu
|
1096db79b6
|
blank site now can be start from rake site:build
|
2013-05-14 10:32:53 +08:00 |
|
Matt K. Fu
|
88d55989de
|
change logger
|
2013-05-14 10:29:11 +08:00 |
|
chris
|
c2331695cd
|
Set order of page context to match the order of structure
Add some params to keep the sorting
|
2013-05-07 11:15:30 +08:00 |