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

• afff128e9c Fix page_part creation when design is changed chris 2012-10-16 14:15:33 +08:00
• f7f0b48707 Merge branch 'master' of github.com:Rulingcom/NCCU chris 2012-10-16 14:14:56 +08:00
• 0babd5f302 Changes for side_bar chris 2012-10-15 15:30:48 +08:00
• a50553219e Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 15:28:24 +08:00
• e6e547e456 add i18n variables Matthew K. Fu JuYuan 2012-10-15 15:15:19 +08:00
• fe183c316f Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 14:46:13 +08:00
• 84929f9b4c fix sub role attribute fields run: Role.any_in(:key=>['department_admin','administrator']).destroy_all for deleting old role data to complete this code. Matthew K. Fu JuYuan 2012-10-15 14:44:48 +08:00
• 5913f73850 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 14:09:58 +08:00
• 31b583228d fixed html for add link. form html Matthew K. Fu JuYuan 2012-10-15 14:07:53 +08:00
• 334e5b464c Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 13:56:16 +08:00
• 7901de7b31 can add member Matthew K. Fu JuYuan 2012-10-15 13:54:29 +08:00
• c511600cad Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 12:35:27 +08:00
• 9027562450 new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +08:00
• b5571dbc43 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Matthew K. Fu JuYuan 2012-10-12 18:17:05 +08:00
• 1ce7f00084 new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +08:00
• 189fa553c5 Changes for helpers, not including all by default chris 2012-10-09 14:47:16 +08:00
• d027cf8e6a add new data from NCCU Matthew K. Fu JuYuan 2012-10-09 14:40:28 +08:00
• a0103d55c4 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site chris 2012-10-09 07:48:17 +08:00
• 9e2bc7e1c1 Ray's changes in css and js OrbitServer 2012-10-09 07:44:26 +08:00
• 05f4555c66 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site OrbitServer 2012-10-09 07:47:00 +08:00
• 483bd7de4a Ray's changes in css and js OrbitServer 2012-10-09 07:44:26 +08:00
• 79e4cef425 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-10-09 06:42:12 +08:00
• f76253f512 Week View changes Harry Bomrah 2012-10-08 16:47:56 +08:00
• bb626470e7 week view updates Harry Bomrah 2012-09-27 13:44:22 +08:00
• 022d28e5e7 change in algo of event generation plus now multi week events enabled Harry Bomrah 2012-09-24 21:26:15 +08:00
• d2fea92969 GPRS and CALENDAR Harry Bomrah 2012-09-17 21:36:40 +08:00
• c2c3774cf9 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-09 06:40:59 +08:00
• 9f825de288 user new interface 70% Matthew K. Fu JuYuan 2012-10-08 16:58:33 +08:00
• 1aacf5e2ce user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object. Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be. Also unnecessary role will be removed if no sub role exists. Matthew K. Fu JuYuan 2012-09-18 16:22:56 +08:00
• e16a27601d user new interface 70% Matthew K. Fu JuYuan 2012-10-08 16:58:33 +08:00
• 59f97f3fef Week View changes Harry Bomrah 2012-10-08 16:47:56 +08:00
• 89b1aace8a fix for rescue job failed on 171 Matthew K. Fu JuYuan 2012-10-08 16:42:49 +08:00
• a4c94c4404 demo site plugin unknown 2012-10-08 16:20:21 +08:00
• 0663e43be7 fix for web_resource tool bar Matthew K. Fu JuYuan 2012-10-08 16:02:33 +08:00
• cf68022d4f fix resque server stop Matthew K. Fu JuYuan 2012-10-08 11:26:24 +08:00
• 4a5fc47c0a NCCU maintenance rake task Matthew K. Fu JuYuan 2012-10-08 10:35:11 +08:00
• 67bd68d492 harry's js fix Matthew K. Fu JuYuan 2012-10-08 10:11:45 +08:00
• e67ca84282 object_auth change to reload Matthew K. Fu JuYuan 2012-10-04 18:20:21 +08:00
• ae48ab5cbd clean commit Matthew K. Fu JuYuan 2012-10-04 15:53:42 +08:00
• 962bae9a82 merge Matt 2012-10-01 21:09:09 +08:00
• b0cdcbecca fix preview bug only happen when production Matthew K. Fu JuYuan 2012-10-01 21:05:16 +08:00
• 7919750d4f 171 doesn't have bug with javascript remove log script Matthew K. Fu JuYuan 2012-10-01 19:05:23 +08:00
• 3dc4dc2316 debug commit Matthew K. Fu JuYuan 2012-10-01 17:56:55 +08:00
• 506fa179a1 fix announcement Matthew K. Fu JuYuan 2012-10-01 17:48:51 +08:00
• b65d785834 harry's fix, announcement still broken Matt 2012-10-01 17:21:23 +08:00
• edcef5a8f7 make manager's news and announcement can be shown at once it be submitted. Matthew K. Fu JuYuan 2012-10-01 16:11:58 +08:00
• 5ac04ea07d devin's css for tinymce Matthew K. Fu JuYuan 2012-09-28 09:58:28 +08:00
• aa5d0bb1ad Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-09-28 09:49:22 +08:00
• 4397adec5c fix i18n Matthew K. Fu JuYuan 2012-09-28 09:46:06 +08:00
• cfc80340b8 add setting for tinymce config Matthew K. Fu JuYuan 2012-09-28 09:45:50 +08:00
• 9a4c8137fe Fix for images Harry Bomrah 2012-09-27 15:33:37 +08:00
• e44495ac9b week view updates Harry Bomrah 2012-09-27 13:44:22 +08:00
• dc8ca7e575 fix i18n.file upload failed Fu Matthew 2012-09-27 13:34:40 +08:00
• 87904f8b8d fix i18n Fu Matthew 2012-09-27 11:03:08 +08:00
• 170bfbab52 fix i18n Matthew K. Fu JuYuan 2012-09-26 10:21:50 +08:00
• 54b874b2c9 fix nccu login Matthew K. Fu JuYuan 2012-09-25 15:07:07 +08:00
• 7a523281c3 fix announcement Matthew K. Fu JuYuan 2012-09-25 09:52:13 +08:00
• 16c51a77a7 change in algo of event generation plus now multi week events enabled Harry Bomrah 2012-09-24 21:26:15 +08:00
• 87e2510d02 add rake task for rebuild index Matthew K. Fu JuYuan 2012-09-24 18:46:38 +08:00
• 5634e87144 fix announcement block Matthew K. Fu JuYuan 2012-09-24 18:43:43 +08:00
• 78a01f5d29 fix for 0924 Matthew K. Fu JuYuan 2012-09-24 18:30:19 +08:00
• 5f63af4e77 fix for search news,needs to applied to announcement,also need to fix some translation Matt 2012-09-24 18:10:48 +08:00
• 029c84328d code that can not run on matt's air Matthew K. Fu JuYuan 2012-09-24 15:37:28 +08:00
• fb3364b28e Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config Matthew K. Fu JuYuan 2012-09-24 14:14:13 +08:00
• 975523c8b2 demo site plugin unknown 2012-09-24 14:10:44 +08:00
• e5fa86c24a fix i18n for search field Matthew K. Fu JuYuan 2012-09-24 12:25:43 +08:00
• 7ca0d2a62b Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-09-24 12:20:59 +08:00
• 136fc68cdc nccu data task Matthew K. Fu JuYuan 2012-09-24 12:18:40 +08:00
• 3a65f599e6 first version app config for Spen durning Chris's leave. Matthew K. Fu JuYuan 2012-09-24 11:43:48 +08:00
• 1646b13f43 Change status translation in Chinese Christophe Vilayphiou 2012-09-24 10:10:06 +08:00
• b4ff5cea05 Merge branch 'yml' of github.com:Rulingcom/NCCU into yml Christophe Vilayphiou 2012-09-24 09:19:19 +08:00
• c846a102ff Page by page changes for i18n yml Christophe Vilayphiou 2012-09-24 08:36:29 +08:00
• 4fb35b00f2 Add missing translations Christophe Vilayphiou 2012-09-21 12:58:44 +08:00
• 2ca7e1b548 Fix typos after i18n yml Christophe Vilayphiou 2012-09-12 20:36:24 +08:00
• e71e890bb6 Fix bugs in zh_tw main Christophe Vilayphiou 2012-09-12 19:42:37 +08:00
• bdd5a1a047 Changes for i18n yml Christophe Vilayphiou 2012-09-12 19:12:50 +08:00
• a04e1fd10b Hot or top for news home banner Christophe Vilayphiou 2012-09-24 08:43:10 +08:00
• 88d562450a Fix home banner for hot news Christophe Vilayphiou 2012-09-21 15:34:18 +08:00
• b6c06c6d4f tiny mce fix Harry Bomrah 2012-09-19 17:59:17 +08:00
• a32027b64b ray's fix Matthew K. Fu JuYuan 2012-09-19 16:34:43 +08:00
• 12db3118b4 Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-09-19 15:09:56 +08:00
• 8b68387199 fix share loading failed Matthew K. Fu JuYuan 2012-09-19 15:09:08 +08:00
• 79006201cd ad_image date picker fixed Matt 2012-09-19 12:23:05 +08:00
• 6fd2dac4d5 fix ad_banner data picker not working when on 180 Matthew K. Fu JuYuan 2012-09-19 12:15:03 +08:00
• d480a10661 fix for object_auth update Matthew K. Fu JuYuan 2012-09-19 11:12:22 +08:00
• 959b6aee12 fix for listing object error Matthew K. Fu JuYuan 2012-09-19 10:45:03 +08:00
• 1240064e23 add url generate Matthew K. Fu JuYuan 2012-09-18 17:37:52 +08:00
• c813a6143b fb share for iNCCU Matthew K. Fu JuYuan 2012-09-18 17:31:51 +08:00
• 2321116597 Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config Matthew K. Fu JuYuan 2012-09-18 16:30:34 +08:00
• 5de433d219 user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object. Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be. Also unnecessary role will be removed if no sub role exists. Matthew K. Fu JuYuan 2012-09-18 16:22:56 +08:00
• 6da3928626 change for NCCU ask Matthew K. Fu JuYuan 2012-09-18 15:49:05 +08:00
• 42c62ebca0 Fix preview for announcement (was retuning js instead of html) Christophe Vilayphiou 2012-09-18 14:31:50 +08:00
• ce47109d33 change link for rss Matthew K. Fu JuYuan 2012-09-18 12:04:45 +08:00
• 0ecb4eca46 change for NCCU entry site Matthew K. Fu JuYuan 2012-09-18 10:54:11 +08:00
• 84205379c1 GPRS and CALENDAR Harry Bomrah 2012-09-17 21:36:40 +08:00
• 43ecebf934 Merge branch 'new' of github.com:Rulingcom/orbit into new Christophe Vilayphiou 2012-09-17 14:31:42 +08:00
• 2c55430c52 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Christophe Vilayphiou 2012-09-17 14:20:07 +08:00
• 0907324a2f add member link to orbit menu Matthew K. Fu JuYuan 2012-09-17 14:12:01 +08:00
• 6a174d57a6 fix setting menu Matthew K. Fu JuYuan 2012-09-17 14:17:06 +08:00
• 4c7906898e add member link to orbit menu Matthew K. Fu JuYuan 2012-09-17 14:12:01 +08:00