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

• bc44d38948 member plugin edit unknown 2013-02-20 17:25:20 +08:00
• a7bc19768e member list edit unknown 2013-02-20 11:12:08 +08:00
• 39c6660c67 Remove useless code not removed in merge Fix argument bug in link_to_field chris 2013-02-19 20:42:46 +08:00
• d19ba7b1c6 Change css mobile for 3 columns chris 2013-02-08 16:16:33 +08:00
• a9aa1dd150 Fix for path renaming chris 2013-02-18 18:21:33 +08:00
• 9e9620c04a Fix item looking for widget when no front end chris 2013-02-08 12:56:35 +08:00
• 6d1f919bb7 Fix links in default widget chris 2013-02-07 21:15:38 +08:00
• 6324233f58 Fix breadcrumb again chris 2013-02-07 19:35:42 +08:00
• d2f837f342 Add task to save pages chris 2013-02-07 19:08:35 +08:00
• 82a8f99208 Fix [again] error in parser for category chris 2013-02-07 19:05:45 +08:00
• ee59228665 Fix error in parser for category chris 2013-02-07 18:57:54 +08:00
• 3e79b787bb Set default widget sort to created_at Don't use page category when home chris 2013-02-07 17:57:36 +08:00
• ec9c68f039 Remove breadcrumb when home chris 2013-02-07 17:26:40 +08:00
• 25d9a3d9b9 Add home to breadcrum chris 2013-02-07 17:09:02 +08:00
• bc21840262 Comment out delete link for archive category Modify the import: - hot_news to announcement - iso_zone of 20000 to 21100 chris 2013-02-07 16:55:23 +08:00
• 324ab266af Fix query in default widget for tags chris 2013-02-07 16:48:12 +08:00
• f5728a4f92 Enable designer to add the class "page_breadcrumb" chris 2013-02-06 21:06:08 +08:00
• b049e16634 Create part and save pages when layout is edited chris 2013-02-06 21:05:17 +08:00
• c27141ff5a Fix query for category in default widget chris 2013-02-06 20:28:06 +08:00
• 5a177f34a8 default widget query for category and tags Fu Matthew 2013-02-06 19:51:53 +08:00
• a9fecec985 Add pagination to default widget for front end page chris 2013-02-06 18:20:45 +08:00
• 0cacfb7c05 Fix path error in parser for breadcrumb chris 2013-02-06 18:14:24 +08:00
• c7cf587581 Fix web links html and index query chris 2013-02-06 16:28:05 +08:00
• 236f68ba84 Fix archive module back end pagination and front end html chris 2013-02-06 16:26:17 +08:00
• 1f11293fbe Fix sitemap in page edit chris 2013-02-06 12:28:10 +08:00
• 17ac564fbb Fix sitemap nil Fix namespace of role in subrole chris 2013-02-06 12:12:23 +08:00
• f36bcb8801 Put missing changes for breadcrumb in page edit chris 2013-02-05 18:38:09 +08:00
• 61648d23e1 Change delete_all to destroy_all chris 2013-02-05 18:26:45 +08:00
• 3676de8a14 Change validation for url: can include IPs chris 2013-02-05 18:22:23 +08:00
• 2a293734c7 Change breadcrumb html chris 2013-02-05 18:17:35 +08:00
• bfad8467c8 breadcrumb widget of front-end has done Rueshyna 2013-02-02 01:25:11 +08:00
• f3bfe67e68 breadcrumb widget of back-end has done, front-end has bug... Rueshyna 2013-02-02 01:24:19 +08:00
• 29b8fec89a Temporary fix: show for default widget - the task migrate:recreate_page_parts must be run - "create_parts" in page.rb must be unprotected chris 2013-02-05 16:34:22 +08:00
• 7105f103e1 Task to delete settings for old version of default widget chris 2013-02-05 12:27:23 +08:00
• e604c38eb4 Push Gemfile.lock chris 2013-02-04 18:40:45 +08:00
• bca4478f68 front_end widget breadcrumb done Rueshyna 2013-02-01 17:07:16 +08:00
• 2a61470f8b back_end widget breadcrumb finish Rueshyna 2013-01-31 19:20:55 +08:00
• 0b88f7d1f8 deliver app config. fix wrong value cause error for default widget Fu Matthew 2013-02-18 19:04:04 +08:00
• 572e512a1d fix link for default widget Fu Matthew 2013-02-18 17:03:18 +08:00
• 0a115906f1 fix i18n,reload problems Fu Matthew 2013-02-18 15:13:31 +08:00
• b7d797f9dd fix member sidebar add i18n for modules and default_widgets Fu Matthew 2013-02-06 17:44:38 +08:00
• fcb49723b4 fix sidebar icon for page. fix i18n on sidebar make sidebar sortable by changing db value. Need interface Fu Matthew 2013-02-04 18:14:00 +08:00
• 96455f31e1 deliver app config. fix wrong value cause error for default widget Fu Matthew 2013-02-18 19:04:04 +08:00
• 3a13ab4634 fix link for default widget Fu Matthew 2013-02-18 17:03:18 +08:00
• a6f6dc271c fix i18n,reload problems Fu Matthew 2013-02-18 15:13:31 +08:00
• 29bb92f841 fix member sidebar add i18n for modules and default_widgets Fu Matthew 2013-02-06 17:44:38 +08:00
• 8e7e601845 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config Fu Matthew 2013-02-04 18:19:47 +08:00
• eed7a22dbe fix sidebar icon for page. fix i18n on sidebar make sidebar sortable by changing db value. Need interface Fu Matthew 2013-02-04 18:14:00 +08:00
• 9771d42587 migrate for app config. fix panel style intro misplace chris 2013-02-04 18:10:39 +08:00
• 2b3cbc50b3 Fix location namespace chris 2013-02-04 18:06:45 +08:00
• 981854870a Changes for mobile copyright chris 2013-01-31 19:32:15 +08:00
• 6eb5061237 Changes for mobile map chris 2013-01-31 18:56:45 +08:00
• e9f2983176 Fix page part kind being removed chris 2013-01-29 22:17:00 +08:00
• 774599a9f2 Set jquery-rails version to 2.1.4 chris 2013-01-29 16:39:55 +08:00
• b1a11b4dad Remove isotope chris 2013-01-29 16:21:01 +08:00
• 3791046e5a Add missing link to writing conference index chris 2013-01-29 15:32:11 +08:00
• bbd30759f5 fix web resource frontend page Fu Matthew 2013-01-29 10:05:50 +08:00
• e244493b55 member plugin edit unknown 2013-01-28 16:19:36 +08:00
• 8e98aa10bc modularize factories Rueshyna 2013-01-17 15:57:12 +08:00
• 8f334f6948 modularize conference Rueshyna 2013-01-24 18:25:09 +08:00
• d4df7c82d3 relpace seminar to conference Rueshyna 2013-01-23 18:35:00 +08:00
• e0fedb4454 change textfiled to bilingual for co_author Rueshyna 2013-01-23 10:58:37 +08:00
• 85ca196dec add bilingual for personal journal Rueshyna 2013-01-22 18:53:39 +08:00
• b2bc62dadd fixed orbit bar that like nccu bar now, and add rails version in Gemfile Rueshyna 2013-01-22 12:19:32 +08:00
• 0b18cf48e3 member roles edit unknown 2013-01-18 11:09:38 +08:00
• 18a51f070e member roles edit unknown 2013-01-18 10:37:55 +08:00
• 87a89f81ce Fix bug for mobile app routes chris 2013-01-16 08:14:42 +08:00
• c33a723a2a Fix css bug when precompile chris 2013-01-16 02:37:49 +08:00
• 71d5abae2e first version of app config and modified inits. Fu Matthew 2013-01-29 20:33:40 +08:00
• 8bf7d0f6f3 member plugin edit unknown 2013-01-28 16:19:36 +08:00
• bfaa22052f Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config Fu Matthew 2013-01-24 16:30:02 +08:00
• fc702a6210 add front-end page for web_resource Fu Matthew 2013-01-24 13:54:14 +08:00
• fea1726f6d fix ajax error when edit new page Fu Matthew 2013-01-24 13:39:08 +08:00
• 979df9ac80 daily commit Fu Matthew 2013-01-23 18:51:18 +08:00
• 0cc616f988 page can use default widget Fu Matthew 2013-01-21 16:56:37 +08:00
• 1c15335fd7 Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin chris 2013-01-18 11:25:55 +08:00
• 781a0ad96e member roles edit unknown 2013-01-18 11:09:38 +08:00
• d0dcd71707 member roles edit unknown 2013-01-18 10:37:55 +08:00
• 04d6fb8785 member roles edit unknown 2013-01-18 11:09:38 +08:00
• 90c6c88f2f Merge branch 'member_plugin' of https://github.com/Rulingcom/orbit into member_plugin unknown 2013-01-18 10:39:29 +08:00
• 2e4fb361d7 member roles edit unknown 2013-01-18 10:37:55 +08:00
• 9630d0a841 Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface Fu Matthew 2013-01-16 14:09:05 +08:00
• 9edf0dca54 ika re-redesign module widget Fu Matthew 2013-01-16 14:07:09 +08:00
• 91830f86aa Fix bug for mobile app routes chris 2013-01-16 08:14:42 +08:00
• 72e26fd92a Fix css bug when precompile chris 2013-01-16 02:37:49 +08:00
• 1f944d23cd Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop chris 2013-01-16 01:35:57 +08:00
• dca4f5d0be mv gallery_uploader Rueshyna 2013-01-15 18:43:13 +08:00
• c44b4163e4 gprs byebye, location have two language, must have picture, long, lang have limit Rueshyna 2013-01-15 17:47:00 +08:00
• 59b618ec35 mv gallery_uploader Rueshyna 2013-01-15 18:43:13 +08:00
• ae25bdf028 Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop Rueshyna 2013-01-15 17:55:14 +08:00
• f1b6771b34 gprs byebye, location have two language, must have picture, long, lang have limit Rueshyna 2013-01-15 17:47:00 +08:00
• 91afad23ba Merge branch 'new_widget_setting_interface' Fu Matthew 2013-01-15 12:03:56 +08:00
• ba75c02622 fix wrong behavior of new interface when a new page is newed Fu Matthew 2013-01-15 12:02:13 +08:00
• 8413e31048 add i18n Fu Matthew 2013-01-15 10:25:55 +08:00
• 634f647afa Set the version of mongo_session_store-rails3 to 3.0.6 chris 2013-01-14 19:20:58 +08:00
• ee529723ad Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface chris 2013-01-14 19:18:50 +08:00
• e1e003af6e Complete new interface Fu Matthew 2013-01-14 18:49:23 +08:00
• 16cfd27fe9 apply view Fu Matthew 2013-01-10 18:00:58 +08:00
• 664ca35801 Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin chris 2013-01-14 19:00:35 +08:00
• 504f5027cc member role edit unknown 2013-01-14 18:19:14 +08:00