Commit Graph

Select branches

Hide Pull Requests

0913_nhu

0913_ntu_common

0913_ntu_ga

0913_ntu_ga_co

0913_ntu_ga_import

0913_ntu_ga_primary

0913_ntu_sa

0913_ntu_sa_en

0913_ntu_sa_regular

0913_ntue

0913_ydu

0917_ntu_mb

0917_ntu_mb_email_display_harry

0917_ntu_mb_sync_harry

1007_announcement_sorting_fix

1015_new_ui_ask_fix

1015_ntu_ga_primary_survey_b_fix

1016_new_ui_ask_module_fix

1016_ntue_fix

1017_ntu_ga

1017_ntu_ga_primary

1017_ntu_ga_rss

1018_new_ui_member_account_previlage_fix

1018_new_ui_member_settings_account

1018_ntu_ga_survey_init_fix

1021_new_ui_member_account_privilege_fix

1021_new_ui_survey_module_authorization_fix

1022_new_ui_bulletin_and_faq_init_fix

1024_new_ui_announcement_preview_fix

1029_new_ui_announcement_init_data_count_fix

1101_ntu_ga_survey_export_fix

1105_new_ui_archive_and_link_fix

1105_ntu_mb_member_fix

1108_new_ui_faq_fix

1115_new_ui_member_frontend_fix

1115_new_ui_member_role_js

1121_new_ui_member_plugins_fix

announcement_display_fix_harry

babel

backend_announcement_fix_harry

banner_fix_harry

calendar_color_category_harry

cron

desktop_devin

desktop_harry_2

development

development_dashboard_manson

fgu

fu

gallery_frontend_fix_harry

gallery_full_fix_harry

gallery_theater_url_fix_harry

geocoding_harry

isotope_fix_for_plugins_harry

jquery_update_development_harry

link_publish_fix_harry

location_category_color_added_harry

location_frontend_harry

location_widget_category_fix_harry

lukas/picked_announcement

master

more_button_harry

mtu_ga_

new_more_button_harry

nkut

nkut_footer

no_idea_harry

ntu_cph

ntu_cph_1115

ntu_cph_update

ntu_ga_1107_fix

ntu_ga_1118_archive_frontend_fix

ntu_mb_data_backup

ntu_mb_sso

ntu_mb_sso_server

ntue_1004_fix

ntue_1105_fix

out_of_names_harry

page_all_category_fix_harry

page_part_edit_form_load_fix_harry

ray_new_ui

site_structure_fix_harry

some_cool_fixes_harry

somthing_fixed_harry

thu

tmu_io

current_test

currently_testing

daily-0402

daily-0425

default_widget_fix_1

last_tested

latest_desktop

master_needs_this_1

master_needs_this_2

more_link_fix

orbit_beta

pick-me-to-product

pick-me-to-product-

pick-me-to-product--

pick-me-to-product---

to_master

to_master_needs_changes_for_new_ui

to_master_needs_changes_for_new_ui_1

to_master_needs_changes_for_new_ui_2

to_master_needs_changes_for_new_ui_3

to_master_needs_changes_for_new_ui_4

Mono Color

• 300de76c3a Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. harrybomrah 2013-06-19 17:16:52 +08:00
• 0b1679871f desktop final fix harrybomrah 2013-06-24 19:23:39 +08:00
• 3bc924926e mongoid yml fix harrybomrah 2013-06-24 19:20:52 +08:00
• 38f9f82e53 some changes again harrybomrah 2013-06-24 19:19:58 +08:00
• 7f36be4c5b some changes harrybomrah 2013-06-24 19:17:24 +08:00
• be6d185be7 Merge branch 'scandary_site_god_setting_feature' into development Matt K. Fu 2013-06-20 17:55:43 +08:00
• 113ed17fb5 Merge branch 'solr_god_feature' into development Matt K. Fu 2013-06-20 17:54:47 +08:00
• c5ced8cf16 remove useless setting for solar Matt K. Fu 2013-06-20 17:42:00 +08:00
• e037507b0e fix solr setting Matt K. Fu 2013-06-19 19:23:45 +08:00
• 2f01b72ed0 fix solr name Matt K. Fu 2013-06-19 16:24:56 +08:00
• cd6dd40f45 add god to monit sold Matt K. Fu 2013-06-19 16:11:16 +08:00
• 345c471fc9 from now on the rescue namespace will be decided by site object field: resque_namespace Matt K. Fu 2013-06-19 15:45:53 +08:00
• ed06be93d6 fix rescue scheduler space error Matt K. Fu 2013-06-19 15:43:02 +08:00
• 1268ce0ae9 remove useless setting for solar Matt K. Fu 2013-06-20 17:42:00 +08:00
• d089822ff3 fixed updated method of events.. was having week error when updating events harrybomrah 2013-06-20 12:47:44 +08:00
• 777af19abb small syntax error missed out yesterday fixed. harrybomrah 2013-06-20 11:55:06 +08:00
• cd55f2aac2 fix solr setting Matt K. Fu 2013-06-19 19:23:45 +08:00
• 07e895fc42 Small change for creating events when calendar is not selected harrybomrah 2013-06-19 17:27:13 +08:00
• 80bf3499be Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. harrybomrah 2013-06-19 17:16:52 +08:00
• c4ec6c1ac9 fix solr name Matt K. Fu 2013-06-19 16:24:56 +08:00
• 6f46a3f949 add god to monit sold Matt K. Fu 2013-06-19 16:11:16 +08:00
• d78e816b4e from now on the rescue namespace will be decided by site object field: resque_namespace Matt K. Fu 2013-06-19 15:45:53 +08:00
• e10eb833ed fix rescue scheduler space error Matt K. Fu 2013-06-19 15:43:02 +08:00
• 0354bf5b15 few updates with fb integration and some other changes in user and supports data to android harrybomrah 2013-06-14 16:08:30 +08:00
• c4db6e5830 simple component update devin chen 2013-06-06 14:11:55 +08:00
• b3c750eade Various view update and change #thmbackground tag devin chen 2013-05-30 15:24:16 +08:00
• 1b5d099fda fix loading Section page for Chrome devin chen 2013-05-24 17:26:43 +08:00
• 6e9effdb9f minor update devin chen 2013-05-21 14:44:14 +08:00
• e1f161cc5d gridster update devin chen 2013-05-20 17:54:39 +08:00
• d61ff5f91c apps update -- app upload and activation harrybomrah 2013-05-14 17:18:05 +08:00
• c9747f9fc6 app manager's view update devin chen 2013-05-13 17:13:44 +08:00
• 269264d232 'select2' minor update devin chen 2013-05-06 17:21:19 +08:00
• 8b53ad6cc6 fixed saving of positions of the tiles again harrybomrah 2013-05-06 14:54:42 +08:00
• 41afb46bf6 app manager view update devin chen 2013-05-06 14:43:31 +08:00
• 7e6433f71c solved desktop conflict during cherry pick harrybomrah 2013-05-02 16:45:33 +08:00
• 1a7a199504 minor update devin chen 2013-05-02 14:02:41 +08:00
• d02806fa58 apps setting view devin chen 2013-04-29 15:13:36 +08:00
• 3f44804717 search fixed again according to devin requirements harrybomrah 2013-04-24 14:22:24 +08:00
• 5b1f5aa64c new search for app manager and few javascript fixes harrybomrah 2013-04-24 13:48:17 +08:00
• 1851ebb6f7 style for checkbox, radio button devin chen 2013-04-24 13:46:36 +08:00
• 93e755b619 removing duplicate code from js file harrybomrah 2013-04-22 17:59:33 +08:00
• 8fd4eb705b publication's view update devin chen 2013-04-22 17:50:30 +08:00
• 4a6313424b duplicate error fixed and css inside widgets fixed, duplicate location fixed harrybomrah 2013-04-22 12:24:09 +08:00
• d752af8549 duplicate error fixed and css inside widgets fixed, duplicate location fixed harrybomrah 2013-04-17 17:53:35 +08:00
• 209b532129 devin branch merge plus minor fixes harrybomrah 2013-04-16 17:02:41 +08:00
• d651669d5c tiny scrollbar update harrybomrah 2013-04-16 16:17:37 +08:00
• ead749cfed minor update devin chen 2013-04-16 15:48:14 +08:00
• fa1d7bfa54 email send cron & send logs for any apps pick-me-to-product Spen 2013-06-17 18:22:24 +08:00
• d3f0a10187 fix default setting for partial category selection error,due to API changing. Matthew K. Fu JuYuan 2013-06-17 15:26:43 +08:00
• 256c51a970 add sold setting back Matthew K. Fu JuYuan 2013-06-17 13:45:30 +08:00
• b674f47528 Remove Syslog chris 2013-06-14 15:30:22 +08:00
• c1bd135595 Fix sortable when there's no record chris 2013-06-13 14:33:15 +08:00
• 96fc5ceea3 survey module: ensure the commit iCross 2013-06-07 18:46:30 +08:00
• e48a1ffece archive module: add sort to frontend module iCross 2013-06-07 22:36:51 +08:00
• e20df41db5 add user log link at site page Matt K. Fu 2013-05-27 14:33:45 +08:00
• e68793afc3 Fix tag delete chris 2013-05-23 17:42:12 +08:00
• 2eaa44c279 announcement module: versioning iCross 2013-06-08 01:52:22 +08:00
• fe7393b9e2 Merge branch 'lukas/picked_archive' into development iCross 2013-06-07 22:44:26 +08:00
• f12e5b8768 archive module: add sort to frontend module iCross 2013-06-07 22:36:51 +08:00
• 57e1ef7bae Merge branch 'lukas/picked_ques' into development iCross 2013-06-07 18:48:06 +08:00
• 642d0ed239 survey module: ensure the commit iCross 2013-06-07 18:46:30 +08:00
• 2f7389ae24 ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p> iCross 2013-06-04 16:07:56 +08:00
• 110eab0496 ask module: add global smtp setting iCross 2013-06-04 16:03:06 +08:00
• ccd760445d ask module: configure resque redis and namespace by config/initializers/resque.rb iCross 2013-05-31 09:24:27 +08:00
• c7effcc96c ask module: create.js.erb iCross 2013-05-30 17:58:52 +08:00
• f3e1f4057d ask module update css iCross 2013-05-30 16:58:33 +08:00
• e353961b21 ask moudule: add ask.css iCross 2013-05-30 15:26:39 +08:00
• 75e27ed849 ask module: default status iCross 2013-05-29 22:26:44 +08:00
• 8541033ba9 ask module: send mail on development iCross 2013-05-29 20:54:22 +08:00
• 467c2e8a3c ask module: fix iCross 2013-05-29 20:30:28 +08:00
• b0640f925b ask module: fix some iCross 2013-05-29 20:21:19 +08:00
• 841fa10c55 ask module: add rescue ackknowledgement iCross 2013-05-29 17:45:32 +08:00
• dcc5fc39a7 ask module: dropdown, icon, big5 encoding, redirect, admin, send mail iCross 2013-05-29 15:14:34 +08:00
• 97df100c64 remove department iCross 2013-05-27 17:39:39 +08:00
• ce180839f0 finish ask module iCross 2013-05-27 17:29:59 +08:00
• 0904978292 Remove non resolved conflict chris 2013-06-07 13:02:47 +08:00
• ddd9a9668e Merge branch 'lukas/picked_archive' into development iCross 2013-06-06 23:12:30 +08:00
• a468b69013 archive module: fix old data caused error iCross 2013-06-06 23:10:42 +08:00
• b6c8a88b73 Merge branch 'lukas/picked_archive' into development iCross 2013-06-06 22:27:08 +08:00
• 5b7ac1a22b archive module: add sort feature to achive files iCross 2013-06-06 22:19:44 +08:00
• d5109c837c Merge branch 'lukas/picked_ques' into development Matt K. Fu 2013-06-06 19:59:30 +08:00
• c63ac751ea archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb iCross 2013-06-04 10:53:31 +08:00
• 8c1e65994a Merge branch 'clean_development' into lukas/picked_ques iCross 2013-06-06 19:08:59 +08:00
• f9a148c901 survey module: move down/up i18n iCross 2013-06-05 18:22:23 +08:00
• 5ea0c5bd5c survey module: result chart display only other iCross 2013-06-04 21:47:25 +08:00
• d2f131d160 survey module: update css iCross 2013-06-02 11:53:24 +08:00
• 8d71c377f2 fix datepicker helper hidden field value iCross 2013-05-30 16:12:52 +08:00
• ec173c4ce1 fix iCross 2013-05-25 10:19:58 +08:00
• ba7d6558ee fix iCross 2013-05-25 10:13:18 +08:00
• 88c57e0b0c fix iCross 2013-05-25 10:05:19 +08:00
• d4962d20b3 fix iCross 2013-05-24 22:55:16 +08:00
• 21bf3a0ccd standalone css and icon iCross 2013-05-24 22:37:40 +08:00
• cf0d7cfc64 new export csv table iCross 2013-05-23 20:56:51 +08:00
• 15347f25dc fix iCross 2013-05-22 18:14:00 +08:00
• 443d1c4fbe csv stats & required start iCross 2013-05-22 18:03:46 +08:00
• 7ba0977e16 stuff iCross 2013-05-20 17:16:06 +08:00
• 531cee70d2 fix iCross 2013-05-18 17:32:43 +08:00
• b659c7021d bug fix and add feature Lukas 2013-05-11 13:52:27 +08:00
• 515185d87c ques: fix submit Lukas 2013-05-10 17:15:55 +08:00
• adc15951bb questionnaire stuff Lukas 2013-05-10 13:04:56 +08:00