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

• d44ac6617a Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 09:41:54 +08:00
• 10473af154 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-02 17:53:00 +08:00
• 2c632551e5 fix preview filed after ad_banner created. Fu Matthew 2013-01-02 17:51:53 +08:00
• f67664df29 custom icon for msoffice Rueshyna 2013-01-02 17:35:21 +08:00
• 5f7453c3fb generalization file type Rueshyna 2013-01-02 16:58:48 +08:00
• f4692182c0 when mouse move to button of announcement file : image => preview pic, file => type Rueshyna 2013-01-02 16:32:47 +08:00
• 506770bf33 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-02 16:34:09 +08:00
• 641b5310b0 fix NTU album module_app data Fu Matthew 2013-01-02 16:04:11 +08:00
• b179668a9c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-02 14:35:34 +08:00
• 32c6f17613 fix object auth. show error message if user try to do object auth in a wrong way. Fu Matthew 2013-01-02 14:34:34 +08:00
• 8a6f92b87b fixed announcement controller syntax error Rueshyna 2013-01-02 10:19:56 +08:00
• 3875e8e79e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-02 10:10:53 +08:00
• 9937b4ac9b Fix deleting links and files in bulletin chris 2012-12-31 18:03:13 +08:00
• ded1d9f44c Add lost file for widget option Fu Matthew 2012-12-28 17:58:35 +08:00
• 30f9295010 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-28 16:06:22 +08:00
• 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu chris 2012-12-28 15:34:24 +08:00
• 61b0f94c04 Remove I18n.locale for announcement front-end Fix counter in back-end edit chris 2012-12-28 15:34:04 +08:00
• 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2012-12-28 15:31:32 +08:00
• baf1240b76 gallery options Fu Matthew 2012-12-28 15:30:46 +08:00
• 4d965d754b Fix urls in tinymce source editor chris 2012-12-28 15:03:02 +08:00
• e8e7c38221 Changes for announcement widget style 1 and categories chris 2012-12-28 14:01:04 +08:00
• 455a27437d Changes for announcement widget style 2 chris 2012-12-28 13:47:30 +08:00
• 974a190eaf Fix orbit_front parser chris 2012-12-28 11:51:56 +08:00
• 0a0298aaad Fix counter front-end chris 2012-12-28 11:44:33 +08:00
• 37309a452d Fix site map and menu order chris 2012-12-28 11:37:37 +08:00
• 17d93409b3 Remove extra double quote in sub_menu Fix web link widget pagination chris 2012-12-28 11:10:33 +08:00
• bab8328029 Put back old tags (don't use the class ProtoTag) chris 2012-12-28 10:43:48 +08:00
• ec96a2e0e7 Add page counter chris 2012-12-28 10:36:18 +08:00
• 1c07224694 fixed page_parts submit button Rueshyna 2012-12-28 10:12:17 +08:00
• c219792a13 fixed delete function of archive file Rueshyna 2012-12-28 10:02:16 +08:00
• 37f8c1637a new desktop framework updates harrybomrah 2012-12-27 18:25:54 +08:00
• 2a122c7f5c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 17:55:19 +08:00
• a7cf6dd694 reverse structure order Rueshyna 2012-12-27 17:54:52 +08:00
• 751d3b1220 Announcement widget: remove I18n.locale Add part_id in url chris 2012-12-27 16:52:58 +08:00
• 3346f83923 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 16:49:50 +08:00
• 269e5b033f Fix for page_part and widget back-end chris 2012-12-27 16:20:40 +08:00
• 2d6b70b97f regenerate pageparts Fu Matthew 2012-12-27 15:50:05 +08:00
• 4db057e971 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 15:28:01 +08:00
• 2901b8e30c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2012-12-27 15:06:19 +08:00
• 2dd0f9a9d2 fix disappear widget inter block Fu Matthew 2012-12-27 15:05:24 +08:00
• 0655baab19 make longer devise timeout Fu Matthew 2012-12-27 15:03:11 +08:00
• 9e07794cbc soft structure order Rueshyna 2012-12-27 14:36:51 +08:00
• 34ed8ae39c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 12:22:19 +08:00
• 177a409508 fixed search_bar placeholder Rueshyna 2012-12-27 10:38:27 +08:00
• 81b0e3c38f change ActiveSupport::SecureRandom to SecureRandom in orbit core Rueshyna 2012-12-27 12:14:59 +08:00
• cfb65dd056 Preventing site default design being deleted. Fu Matthew 2012-12-27 10:20:37 +08:00
• 71fc85c24e fix widget. Matthew K. Fu JuYuan 2012-12-25 10:45:08 +08:00
• 2dd2368378 remove merge marks Matthew K. Fu JuYuan 2012-12-25 11:26:23 +08:00
• 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config Matthew K. Fu JuYuan 2012-12-25 11:01:36 +08:00
• ec791a6646 keep zh_Tw alive Matthew K. Fu JuYuan 2012-12-25 10:45:33 +08:00
• 47a63e3dab fix widget. Matthew K. Fu JuYuan 2012-12-25 10:45:08 +08:00
• 41bcbdd2f0 missing file? Matthew K. Fu JuYuan 2012-12-24 11:55:33 +08:00
• 062ebecae3 fix serval bugs on sidebar. Matthew K. Fu JuYuan 2012-12-07 12:40:47 +08:00
• 2c69590c36 rename of GPRS now it's named location Matthew K. Fu JuYuan 2012-12-07 12:40:21 +08:00
• 397729d3a1 Remove GPRS Matthew K. Fu JuYuan 2012-12-07 12:36:25 +08:00
• 53afb6ea0c sidebar rewrited Matthew K. Fu JuYuan 2012-12-05 18:35:58 +08:00
• 5f712622ad default widgets and sidebar. Matthew K. Fu JuYuan 2012-12-03 18:52:36 +08:00
• 6995bb1622 put module app json into init,making orbit app work with module app. Matthew K. Fu JuYuan 2012-11-29 14:21:46 +08:00
• 36f6a6fdd6 first version of confined sidebar render Matthew K. Fu JuYuan 2012-11-20 15:56:52 +08:00
• 194b42c1e4 fix widget from post method Matthew K. Fu JuYuan 2012-12-24 15:22:26 +08:00
• b89cd80800 fix widget bug Matthew K. Fu JuYuan 2012-12-24 14:04:32 +08:00
• 5002916352 Remove mysql chris 2012-12-22 17:35:59 +08:00
• 8381941d51 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu chris 2012-12-21 18:36:01 +08:00
• e1a3201830 Fix multiple pop-ups in structure delete chris 2012-12-21 18:34:13 +08:00
• 507191426e Fix submenu error chris 2012-12-21 14:56:12 +08:00
• 68266e17ed Update Gemfile for rails 3.2 nccu 2012-12-20 20:18:33 +08:00
• 3c79200c2f Fix wrong deletion in parser for gallery chris 2012-12-20 16:02:03 +08:00
• 8ec0b35245 Fix wrong deletion in parser for gallery chris 2012-12-20 16:01:27 +08:00
• e9815c3d9b Fix css bug when precompiling assets chris 2012-12-20 14:34:02 +08:00
• 7ac6958690 Fix css bug when precompiling assets chris 2012-12-20 14:32:06 +08:00
• fc076a28bd Remove useless css chris 2012-12-20 13:53:28 +08:00
• 30268ab3bc Remove useless css chris 2012-12-20 13:52:23 +08:00
• 3a9106c10d Add mobile but remove news in it chris 2012-12-20 03:21:50 +08:00
• d827fbc852 Comment out desktop links chris 2012-12-19 21:32:55 +08:00
• cf91139b84 Merge branch 'member_data' of github.com:Rulingcom/orbit into member_data chris 2012-12-19 20:22:25 +08:00
• b4633a2ccb .not_guest_user Rueshyna 2012-12-19 18:51:17 +08:00
• 3d39c2c3c3 hidden guest user Rueshyna 2012-12-19 16:46:01 +08:00
• ec1fad9729 fixed empty name of member list Rueshyna 2012-12-19 15:28:49 +08:00
• 1372f51e75 .not_guest_user Rueshyna 2012-12-19 18:51:17 +08:00
• 83fb5230a4 Changes for site map front end indentation chris 2012-12-19 17:26:38 +08:00
• fcbba6660b Only one parser for front end Separate site map for i18n chris 2012-12-19 17:15:31 +08:00
• 6035428422 hidden guest user Rueshyna 2012-12-19 16:46:01 +08:00
• 0fa1b43f06 fixed empty name of member list Rueshyna 2012-12-19 15:28:49 +08:00
• fdae7e4a2c Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2012-12-19 15:06:57 +08:00
• 858e942da2 fix serval bugs on sidebar. Matthew K. Fu JuYuan 2012-12-07 12:40:47 +08:00
• bd743a0ca5 rename of GPRS now it's named location Matthew K. Fu JuYuan 2012-12-07 12:40:21 +08:00
• f1c628f2d6 Merge branch 'publication' chris 2012-12-07 12:39:37 +08:00
• dc84023372 Merge branch 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 12:38:48 +08:00
• 607a4f5acf fixed fileview in english mode harrybomrah 2012-12-07 11:19:40 +08:00
• 9dde79414d all sections and sections megerd harrybomrah 2012-12-07 10:10:38 +08:00
• e07fb7d434 Remove GPRS Matthew K. Fu JuYuan 2012-12-07 12:36:25 +08:00
• a1b1fc9d34 Remove test chris 2012-12-07 12:32:43 +08:00
• ff435a4af4 Change the design for the whole site form designs index chris 2012-12-07 12:14:31 +08:00
• acaf707900 Merge branch 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 11:22:06 +08:00
• ad8273d638 fixed fileview in english mode harrybomrah 2012-12-07 11:19:40 +08:00
• 4d07b0753c Merge branch 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 10:13:41 +08:00
• 08b99011d0 all sections and sections megerd harrybomrah 2012-12-07 10:10:38 +08:00
• c74ead8318 Redirect to designs after buying template Randomise buy counts chris 2012-12-07 09:07:49 +08:00
• a48690d4bf Merge branches 'publication' and 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 04:21:41 +08:00
• 1c7ddb4b29 fixed empty db bug Rueshyna 2012-12-06 22:29:43 +08:00