 Harry Bomrah
|
7e6433f71c
|
solved desktop conflict during cherry pick
|
2013-06-18 15:24:41 +08:00 |
devin chen
|
1a7a199504
|
minor update
|
2013-06-18 15:23:18 +08:00 |
|
devin chen
|
d02806fa58
|
apps setting view
|
2013-06-18 15:22:47 +08:00 |
|
Harry Bomrah
|
3f44804717
|
search fixed again according to devin requirements
|
2013-06-18 15:22:22 +08:00 |
|
Harry Bomrah
|
5b1f5aa64c
|
new search for app manager and few javascript fixes
|
2013-06-18 15:20:40 +08:00 |
|
devin chen
|
1851ebb6f7
|
style for checkbox, radio button
|
2013-06-18 15:20:33 +08:00 |
|
Harry Bomrah
|
93e755b619
|
removing duplicate code from js file
|
2013-06-18 15:20:19 +08:00 |
|
devin chen
|
8fd4eb705b
|
publication's view update
|
2013-06-18 15:20:02 +08:00 |
|
Harry Bomrah
|
4a6313424b
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-06-18 15:19:09 +08:00 |
|
Harry Bomrah
|
d752af8549
|
duplicate error fixed and css inside widgets fixed, duplicate location fixed
|
2013-06-18 15:17:07 +08:00 |
|
Harry Bomrah
|
d651669d5c
|
tiny scrollbar update
|
2013-06-18 15:13:52 +08:00 |
|
devin chen
|
ead749cfed
|
minor update
|
2013-06-18 15:12:52 +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 |
chris
|
c1bd135595
|
Fix sortable when there's no record
|
2013-06-14 15:26:12 +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
|
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
|
dcc5fc39a7
|
ask module: dropdown, icon, big5 encoding, redirect, admin, send mail
|
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
|
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
|
21bf3a0ccd
|
standalone css and icon
|
2013-06-06 18:41:27 +08:00 |
|
iCross
|
443d1c4fbe
|
csv stats & required start
|
2013-06-06 18:38:47 +08:00 |
|
iCross
|
531cee70d2
|
fix
|
2013-06-06 18:31:28 +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
|
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
|
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 |
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 |