Spen
|
d1fd2b6984
|
fix app sub manager and ask verification code
|
2013-11-07 18:06:16 +08:00 |
chris
|
cd26b880fb
|
Change the logo and favicon
|
2013-09-13 15:42:52 +08:00 |
|
chris
|
7c398ce4fe
|
Changes for NTU General Affairs
|
2013-09-13 15:10:27 +08:00 |
|
chris
|
d766eea9f4
|
Changes for NTU common
Conflicts:
lib/tasks/migrate.rake
Conflicts:
lib/tasks/migrate.rake
Conflicts:
config/resque_schedule.yml
lib/tasks/migrate.rake
|
2013-09-13 15:10:10 +08:00 |
|
chris
|
8ad015af7f
|
Remove before filter in user.rb in addition to the previous fix (Fix for user and role relationship)
|
2013-09-13 11:56:57 +08:00 |
|
chris
|
1857ad428c
|
Fix for user and role relationship
Conflicts:
lib/tasks/migrate.rake
|
2013-09-12 15:35:53 +08:00 |
Matt K. Fu
|
134b639465
|
fix announcement language
|
2013-09-09 17:35:22 +08:00 |
|
Matt K. Fu
|
45136f915d
|
fix news default widget shows un-checked bulletins.
|
2013-09-09 11:14:31 +08:00 |
Matthew K. Fu JuYuan
|
e1c57c6843
|
fixed default widget for tags
|
2013-09-03 16:17:45 +08:00 |
|
Matt K. Fu
|
e7aa7ea1fa
|
added sorting DSL
|
2013-09-02 16:33:50 +08:00 |
|
Matt K. Fu
|
1ccfd6e48c
|
fix sorting for default widget
|
2013-08-30 16:52:46 +08:00 |
|
Matt K. Fu
|
23516277f3
|
fix default widget query
|
2013-08-30 10:15:18 +08:00 |
|
Matt K. Fu
|
27b86b078a
|
fix counter for recording request.
|
2013-08-28 17:56:03 +08:00 |
|
Matt K. Fu
|
473baa9b95
|
add backup job
|
2013-08-27 15:59:17 +08:00 |
|
Matt K. Fu
|
2e5b2555c6
|
from now on the rescue namespace will be decided by site object field: resque_namespace
|
2013-08-27 15:59:16 +08:00 |
saurabhbhatia
|
1ebda22f0e
|
Updated with loader
Conflicts:
vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb
vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb
|
2013-08-27 14:29:53 +08:00 |
|
chris
|
fa1c731ad3
|
Remove registerable
|
2013-07-30 18:24:05 +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 |
|
Spen
|
b37643147f
|
mail_cron add send_mail_now and mail cron log fix
|
2013-07-19 17:18:48 +08:00 |
|
Spen
|
ec57cbff1c
|
ntue mail cron & log filter fix
|
2013-07-19 17:18:34 +08:00 |
|
Spen
|
7d6df11873
|
email send cron & send logs for any apps
|
2013-07-19 17:01:54 +08:00 |
|
Matt K. Fu
|
8043573370
|
fix delay impressionist for tags and pages
|
2013-07-19 17:00:38 +08:00 |
|
chris
|
f025c98ffa
|
Fix sorted_tags_for_cloud: it's now using the cloud_view_count
|
2013-07-19 01:52:36 +08:00 |
|
Matt K. Fu
|
ceac2b842c
|
fix impression page counter
|
2013-07-18 12:04:37 +08:00 |
|
chris
|
3c3bba514a
|
Fix get_item and more link in front end
|
2013-07-17 11:36:20 +08:00 |
|
Matt K. Fu
|
aea15fa622
|
add class to default widget if row data is hot or top
|
2013-07-16 17:41:22 +08:00 |
|
Matthew K. Fu JuYuan
|
c1316f72a0
|
remove new design button
|
2013-07-15 17:10:30 +08:00 |
|
Matthew K. Fu JuYuan
|
d996b91b54
|
preview by default widget
|
2013-07-15 17:09:48 +08:00 |
|
Matt K. Fu
|
869f3b6815
|
fix object de-authorize failed.
|
2013-06-26 12:28:00 +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 |