devin chen
|
e1f161cc5d
|
gridster update
|
2013-06-18 15:28:51 +08:00 |
 Harry Bomrah
|
d61ff5f91c
|
apps update -- app upload and activation
|
2013-06-18 15:27:53 +08:00 |
|
devin chen
|
c9747f9fc6
|
app manager's view update
|
2013-06-18 15:26:53 +08:00 |
|
devin chen
|
269264d232
|
'select2' minor update
|
2013-06-18 15:26:36 +08:00 |
|
Harry Bomrah
|
8b53ad6cc6
|
fixed saving of positions of the tiles again
|
2013-06-18 15:26:15 +08:00 |
|
devin chen
|
41afb46bf6
|
app manager view update
|
2013-06-18 15:25:49 +08:00 |
|
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
|
209b532129
|
devin branch merge plus minor fixes
|
2013-06-18 15:16:56 +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 |
|
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 |