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

• c856b4cdce Fix for upload image component in announcement Christophe Vilayphiou 2012-04-24 12:41:28 +08:00
• 8bf55a184e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 12:20:14 +08:00
• 42aeaead93 Ray's changes, put the js for upload image component in a separate file Christophe Vilayphiou 2012-04-24 12:15:32 +08:00
• 27bd26ff52 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 11:40:42 +08:00
• b80339d704 Ray's changes for image upload component and sign-in page Christophe Vilayphiou 2012-04-24 11:35:50 +08:00
• f05b7db73a Fix for parser sub_menu Add style to the sub_menu Christophe Vilayphiou 2012-04-24 11:26:36 +08:00
• 6e431b6137 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew K. Fu JuYuan 2012-04-24 11:26:13 +08:00
• 8041452be5 Fix for translation in sort headers for announcement Christophe Vilayphiou 2012-04-24 11:05:01 +08:00
• 308cfc7cf2 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 02:46:06 +08:00
• 6831a3dbbb Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 02:44:39 +08:00
• 0c4328987a Ray's changes for css files, sort headers in announcement and pagination Christophe Vilayphiou 2012-04-24 02:37:51 +08:00
• d4aea664e2 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 02:37:03 +08:00
• a748ccaac7 Patch from ldap for announcement translation Christophe Vilayphiou 2012-04-24 02:33:35 +08:00
• a5b13e680f Add sub_menu in r_tags Christophe Vilayphiou 2012-04-24 02:30:40 +08:00
• db1b84e962 Fix bug where an rejected announcement could still be edited by url Christophe Vilayphiou 2012-04-24 00:58:56 +08:00
• 6130f8b1e4 Fix errors in status filter in announcement Christophe Vilayphiou 2012-04-24 00:53:05 +08:00
• b502bedd0f Fix filter and sort for status in announcement Christophe Vilayphiou 2012-04-24 00:46:34 +08:00
• 670ec2a40e Themes from db fixed.. Harry Bomrah 2012-04-23 21:04:02 +08:00
• 0836583694 Disable ad_banner_preview. Just show window Matthew K. Fu JuYuan 2012-04-23 18:29:23 +08:00
• a5db2382e7 Fix ad image date selector Matthew K. Fu JuYuan 2012-04-23 18:20:12 +08:00
• 4f87165039 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Christophe Vilayphiou 2012-04-23 18:10:16 +08:00
• e0d3319ea9 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-04-23 17:21:30 +08:00
• 35452c039d Fix ad_banner Matthew K. Fu JuYuan 2012-04-23 17:03:55 +08:00
• 834cbe3a11 Fix side_bar for tags Modules needs to use the fullpath for active or visible in tags Christophe Vilayphiou 2012-04-23 16:12:07 +08:00
• 3280ff8311 archive checkbox unknown 2012-04-23 15:53:58 +08:00
• a8eeaf235f Add Announcement translation Matt 2012-04-23 15:28:56 +08:00
• 5a423178e3 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-23 15:16:50 +08:00
• 1ebf460f7e Fix 'loading fail' in front-end for announcement The show action was returning an array instead of a bulletin Christophe Vilayphiou 2012-04-23 14:47:33 +08:00
• 499930a680 Pull from github Christophe Vilayphiou 2012-04-23 14:29:55 +08:00
• 2eeb530422 Merge branch 'master' into ldap Christophe Vilayphiou 2012-04-23 14:13:37 +08:00
• 09910ca4ae Rmove therubyraces from Gemfile.lock Christophe Vilayphiou 2012-04-23 14:12:18 +08:00
• d71d0f7e89 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-23 14:08:23 +08:00
• 67ba2389a2 fix js Matthew K. Fu JuYuan 2012-04-18 16:24:17 +08:00
• 8eedbc951e add i18n vars Matthew K. Fu JuYuan 2012-04-18 15:33:11 +08:00
• 0c46b4da23 AdImage and AnBanner JS fixed Matthew K. Fu JuYuan 2012-04-18 15:26:59 +08:00
• 81b0046f42 Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image. Matthew K. Fu JuYuan 2012-04-17 16:03:48 +08:00
• e353afb5ac fix i18n vars in ad_banner Matthew K. Fu JuYuan 2012-04-17 15:21:43 +08:00
• 1b70852ff7 realtime preview is working. but save to object when preview Matthew K. Fu JuYuan 2012-04-17 11:34:25 +08:00
• 8cc0611c4a Ray's fix for ad_banner Matthew K. Fu JuYuan 2012-04-13 18:02:36 +08:00
• 30edc317b2 text area for ad_image Matthew K. Fu JuYuan 2012-04-13 17:51:19 +08:00
• ff472714de AdBanner i18n vars patch Matthew K. Fu JuYuan 2012-04-13 17:24:30 +08:00
• 2f279c53ff Apply patch from ldap Christophe Vilayphiou 2012-04-19 11:50:54 +08:00
• 868118116b Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap Matthew K. Fu JuYuan 2012-04-23 13:58:56 +08:00
• 6a4203b850 Ray's css fix with widget css Matthew K. Fu JuYuan 2012-04-23 11:53:36 +08:00
• b6f64cd8a5 Announcement i18n vars Matt 2012-04-23 11:29:00 +08:00
• fe9032787c NCCU ldap debug nccu 2012-04-23 10:13:44 +08:00
• 8c42f6bb7c Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-04-20 14:44:57 +08:00
• 2ebed9e44a javascript update devin 2012-04-20 09:45:40 +08:00
• 1f077cf2b3 javascript update devin 2012-04-20 07:31:48 +08:00
• 19750d69e0 some update devin 2012-04-20 05:38:53 +08:00
• 3eaf97babe title and heading and welcome msg… Harry Bomrah 2012-04-19 20:26:21 +08:00
• c3eef6eaa6 ok this is final hahaha… Harry Bomrah 2012-04-19 17:06:19 +08:00
• 3c5b7a5de3 Modified confirm box… Harry Bomrah 2012-04-19 15:36:03 +08:00
• 7e355b77c2 Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap Matthew K. Fu JuYuan 2012-04-19 14:31:05 +08:00
• ba0677a001 Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap Matthew K. Fu JuYuan 2012-04-19 14:09:37 +08:00
• f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap Matthew K. Fu JuYuan 2012-04-19 14:06:00 +08:00
• 72efdbd742 changes before Chirs and Ray's trip Christophe Vilayphiou 2012-04-19 11:50:54 +08:00
• 4bad25e682 Msg box added and background image saving complete Harry Bomrah 2012-04-18 22:01:12 +08:00
• b4bf81d40a background image… Harry Bomrah 2012-04-18 18:20:39 +08:00
• 6b35cf821e some updates Harry Bomrah 2012-04-18 18:15:02 +08:00
• 30a6dc6a95 Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-04-18 17:58:49 +08:00
• 11a0875c44 color changes in custom color… Harry Bomrah 2012-04-18 17:57:47 +08:00
• 170c12bcdd fix js Matthew K. Fu JuYuan 2012-04-18 16:24:17 +08:00
• 0ddb66a3c9 add i18n vars Matthew K. Fu JuYuan 2012-04-18 15:33:11 +08:00
• 8d776fd30d AdImage and AnBanner JS fixed Matthew K. Fu JuYuan 2012-04-18 15:26:59 +08:00
• d14630769a Bg color fixed… Harry Bomrah 2012-04-18 14:57:00 +08:00
• b743413be9 function update devin 2012-04-18 13:17:12 +08:00
• 7b391904f7 Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin Harry Bomrah 2012-04-17 21:20:36 +08:00
• 95a1e266ae Custom thème done and theme id done… Harry Bomrah 2012-04-17 21:15:40 +08:00
• 1f44a10206 wallpaper added devin 2012-04-17 18:06:07 +08:00
• b2d72902c3 Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-04-17 16:35:58 +08:00
• 02c6933d0b Tiles position saved in db and also change them from section manager Harry Bomrah 2012-04-17 16:33:41 +08:00
• 8cd4844689 html change devin 2012-04-17 16:32:11 +08:00
• 51190a79cb Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image. Matthew K. Fu JuYuan 2012-04-17 16:03:48 +08:00
• a9a4ca6ede fix i18n vars in ad_banner Matthew K. Fu JuYuan 2012-04-17 15:21:43 +08:00
• 06a3128be5 realtime preview is working. but save to object when preview Matthew K. Fu JuYuan 2012-04-17 11:34:25 +08:00
• 4f18257733 try devin 2012-04-17 01:32:53 +08:00
• 6cdebb440d Ray's fix for ad_banner Matthew K. Fu JuYuan 2012-04-13 18:02:36 +08:00
• 92e898a656 Merge branch 'master' into ldap Christophe Vilayphiou 2012-04-13 17:52:15 +08:00
• 7cf00d1d93 text area for ad_image Matthew K. Fu JuYuan 2012-04-13 17:51:19 +08:00
• d81ca40f90 AdBanner i18n vars patch Matthew K. Fu JuYuan 2012-04-13 17:24:30 +08:00
• 8d2e5210a1 alert removes Harry Bomrah 2012-04-13 17:06:27 +08:00
• d92451d079 alert removed Harry Bomrah 2012-04-13 17:05:47 +08:00
• 7479a64c95 width changes in section page Harry Bomrah 2012-04-13 17:01:00 +08:00
• 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew K. Fu JuYuan 2012-04-13 16:52:14 +08:00
• 4af73ecf6f fix preview window size. Matthew K. Fu JuYuan 2012-04-13 16:46:16 +08:00
• 0fe5baf93f fix for letting ad_banner display even when file in not uploaded Matthew K. Fu JuYuan 2012-04-13 16:14:43 +08:00
• a2e35f3626 Merge branch 'master' into ldap Christophe Vilayphiou 2012-04-13 16:03:57 +08:00
• 957d4eaebb Merge branch 'master' into desktop_harry Christophe Vilayphiou 2012-04-13 16:03:43 +08:00
• ebf9a896aa Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-04-13 15:57:42 +08:00
• 31baa2cb63 new archive unknown 2012-04-13 15:24:19 +08:00
• ca0fc4c767 Comment out code that bugged upload image in ad_banner Christophe Vilayphiou 2012-04-13 15:53:25 +08:00
• d1feb102d0 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-13 15:27:10 +08:00
• d646a9dff1 fix new ad_image data selector bug Matthew K. Fu JuYuan 2012-04-13 15:24:59 +08:00
• 0bcb74d793 new archive unknown 2012-04-13 15:24:19 +08:00
• 8167172ca9 Merge branch 'master' into desktop_harry Christophe Vilayphiou 2012-04-13 14:05:08 +08:00
• 5f16059301 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-13 13:53:00 +08:00
• de035cb89a fix date selector value fill back problem Matthew K. Fu JuYuan 2012-04-13 12:47:57 +08:00
• f54dba8b0b Merge branch 'master' into desktop_harry Christophe Vilayphiou 2012-04-13 13:39:00 +08:00
• 1e43349eb8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew K. Fu JuYuan 2012-04-13 12:48:57 +08:00