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

• 2ec3d77600 widget code rewritten for gallery master branch harrybomrah 2013-09-14 18:18:59 +08:00
• 5e1d6663a1 NTUE Logo Manson Wang 2013-09-30 14:09:00 +08:00
• 19801eb10f Fix parser_front_end.rb for page content chris 2013-09-17 18:00:30 +08:00
• e5ea34d088 fixed external links opening in different window harrybomrah 2013-09-17 15:51:46 +08:00
• 5944a7fcb6 FGU Logo Manson Wang 2013-09-30 13:38:56 +08:00
• 4abe4f5c16 ntue email_ers fix and announcement widget filed fix Spen 2013-09-27 17:06:12 +08:00
• 3eeda5410c Fix bugs Bernie Chiu 2013-09-27 17:15:49 +08:00
• 660960f316 fix first reply error thomaschen 2013-09-27 17:03:09 +08:00
• 52356d3316 Fix params name for rss to_master_needs_changes_for_new_ui_4 chris 2013-09-27 16:52:50 +08:00
• 696134aa18 Fix ip direct Bernie Chiu 2013-09-27 16:40:34 +08:00
• 2777b92589 Test ip direct Bernie Chiu 2013-09-27 16:30:36 +08:00
• 49f1cfd251 Merge branch 'ntu_mb_sso_server' of https://github.com/Rulingcom/orbit into ntu_mb_sso_server saurabhbhatia 2013-09-27 16:24:10 +08:00
• e33ab01b53 Updated filename of writing seminars to writing conferences saurabhbhatia 2013-09-27 15:12:30 +08:00
• 5bb0f2c991 sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• db00b8c2b6 Fixed Sync multiple redirect issue saurabhbhatia 2013-09-27 16:22:47 +08:00
• 3825ab0264 Updated filename of writing seminars to writing conferences saurabhbhatia 2013-09-27 15:12:30 +08:00
• c457735c2f Updated file name in writing conferences front end saurabhbhatia 2013-09-27 15:09:18 +08:00
• 4b56866d23 Updated file name in writing conferences front end saurabhbhatia 2013-09-27 15:09:18 +08:00
• 5432238816 merge thomaschen 2013-09-27 15:07:19 +08:00
• 4e12c0bb5b (test)remote ip thomaschen 2013-09-27 15:04:35 +08:00
• d68f324ca3 Merge Bernie Chiu 2013-09-27 14:46:18 +08:00
• 8ec129f559 Updated order for zh_tw translation saurabhbhatia 2013-09-27 14:33:19 +08:00
• 50f5d12da3 fix status error thomaschen 2013-09-27 14:35:25 +08:00
• b55d3d9475 Updated order for zh_tw translation saurabhbhatia 2013-09-27 14:33:19 +08:00
• e7c77b55d9 Merge branch 'ntu_mb_sso_server' of https://github.com/Rulingcom/orbit into ntu_mb_sso_server saurabhbhatia 2013-09-27 12:50:11 +08:00
• b415b23db2 sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• a6b47d9e72 Fix for user order chris 2013-09-27 12:46:19 +08:00
• dfec6f7642 Fix for user order chris 2013-09-27 12:46:19 +08:00
• 035ce03821 Merge branch 'ntu_mb_sso_server' of https://github.com/Rulingcom/orbit into ntu_mb_sso_server saurabhbhatia 2013-09-27 12:43:29 +08:00
• 9fb8c18bf5 sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• fd77230247 email hide show facility available harrybomrah 2013-09-27 12:15:16 +08:00
• c9d6f7d78e this is useless push for github to work 0917_ntu_mb_email_display_harry harrybomrah 2013-09-27 12:30:40 +08:00
• 79bc9240b7 email hide show facility available harrybomrah 2013-09-27 12:15:16 +08:00
• 250a03f074 Fixed order of Teacher Show page saurabhbhatia 2013-09-27 12:01:41 +08:00
• d635c892cf fix dns error thomaschen 2013-09-27 11:22:37 +08:00
• ac86496721 Merge branch 'ntu_mb_sso_server' of https://github.com/Rulingcom/orbit into ntu_mb_sso_server saurabhbhatia 2013-09-27 11:14:27 +08:00
• 52baa91234 sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb saurabhbhatia 2013-09-27 11:10:07 +08:00
• 9186978551 new ui member plugin sort fix and user show avatar fix Spen 2013-09-26 20:02:41 +08:00
• c3d8ed5c0c Merge branch 'ntu_mb_sso_server' of https://github.com/Rulingcom/orbit into ntu_mb_sso_server saurabhbhatia 2013-09-26 22:44:19 +08:00
• 7dc8250a73 sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• 9a03e7a6b2 added sync for journal paper books and conference.. and also disabled the icons harrybomrah 2013-09-26 22:26:19 +08:00
• 638ed73d21 added sync for journal paper books and conference.. and also disabled the icons 0917_ntu_mb_sync_harry harrybomrah 2013-09-26 22:26:19 +08:00
• 096aec3406 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb Bring Development Related Changes to ntu_mb saurabhbhatia 2013-09-26 20:31:46 +08:00
• 622534e5db Fix user order: - gender color - add cancel button for input chris 2013-09-26 20:18:34 +08:00
• 52c896d8c5 some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules. harrybomrah 2013-09-26 19:36:54 +08:00
• 028c689739 Change User.all to User.not_guest_user Spen 2013-09-26 19:46:14 +08:00
• f81894af90 User ordering Run the task new_ui:save_users chris 2013-09-26 18:59:23 +08:00
• 09e0d5bd92 sso for ntu mb all sites Spen 2013-09-26 15:23:03 +08:00
• 1159375de7 Updated Import to Sync Data for all personal plugins saurabhbhatia 2013-09-26 18:49:27 +08:00
• dc3593c162 zh-tw for new ui Manson Wang 2013-09-26 17:11:56 +08:00
• 843775a2c0 Fixed the order in Personal Plugin member show page saurabhbhatia 2013-09-26 16:38:24 +08:00
• 16c26e3273 Fix path of jquery.cycle.all.latest.js Manson Wang 2013-09-26 15:56:43 +08:00
• c5935f7104 Fix path of jquery.cycle.all.latest.js Manson Wang 2013-09-26 15:56:43 +08:00
• 341dc67a5f Fix path of jquery.cycle.all.latest.js Manson Wang 2013-09-26 15:56:43 +08:00
• ab492076cb sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• 4053ccbcdd sso for ntu mb all sites ntu_mb_sso Spen 2013-09-26 15:23:03 +08:00
• 1021ac2e9b Merge branch '0917_ntu_mb' of https://github.com/Rulingcom/orbit into 0917_ntu_mb saurabhbhatia 2013-09-26 14:46:14 +08:00
• ab04070a8e Updated show to remove test code saurabhbhatia 2013-09-25 17:33:05 +08:00
• 5ec011a5ff Fixed Personal Plugins tabs for en locale saurabhbhatia 2013-09-25 17:07:15 +08:00
• cd8448d447 Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix Spen 2013-09-18 17:31:53 +08:00
• 7990d4388c Import Announcements, Journal Paper, Conference Data, book data saurabhbhatia 2013-09-11 09:54:07 +08:00
• 367cf67928 Get data from database saurabhbhatia 2013-09-10 17:27:43 +08:00
• 25c1f191b2 Added read rss2 annoucement feature Manson Wang 2013-09-26 13:38:27 +08:00
• e7c04c6e6e small add question fix for survey module. harrybomrah 2013-09-25 19:40:47 +08:00
• 6ac600fb5c brief added to desktop for all plugins harrybomrah 2013-09-25 18:11:02 +08:00
• 42dcf0a2d2 survey edit completed harrybomrah 2013-09-23 20:30:09 +08:00
• c35d42d671 external links and link widget fixed for development harrybomrah 2013-09-24 11:30:39 +08:00
• 5332162646 small add question fix for survey module. harrybomrah 2013-09-25 19:40:47 +08:00
• 6b85824a90 Fix module survey_b back_end button link Manson Wang 2013-09-25 19:42:33 +08:00
• f1a96505ef Fix module web_resource front_end display skip blank title Manson Wang 2013-09-25 19:17:58 +08:00
• 926102bf72 Fix module web_resource front_end display skip blank title Manson Wang 2013-09-25 19:17:58 +08:00
• 1d0ea6718f brief added to desktop for all plugins harrybomrah 2013-09-25 18:11:02 +08:00
• 26bc837c76 Modify fail definition Bernie Chiu 2013-09-25 17:53:35 +08:00
• 1b5f6a79c7 widget link fixed on homepage harrybomrah 2013-09-17 17:26:59 +08:00
• 8247f077df Change status based on your requests sent Bernie Chiu 2013-09-25 17:46:32 +08:00
• 6fc47d7afd Updated show to remove test code saurabhbhatia 2013-09-25 17:33:05 +08:00
• 04ff345b94 survey edit completed harrybomrah 2013-09-23 20:30:09 +08:00
• 79c4cd2075 Fixed Personal Plugins tabs for en locale saurabhbhatia 2013-09-25 17:07:15 +08:00
• eb8495bcbd widget code rewritten for gallery master branch harrybomrah 2013-09-14 18:18:59 +08:00
• 5899a0f0d9 ad_banner banner load fixed for test site harrybomrah 2013-09-13 12:36:41 +08:00
• 93c5e863bf ad_banner banner load fixed for test site harrybomrah 2013-09-13 12:36:41 +08:00
• 414208d95d widget code rewritten for gallery master branch harrybomrah 2013-09-14 18:18:59 +08:00
• 70de1cea9d Modify syntax Bernie Chiu 2013-09-25 14:55:02 +08:00
• 0f18cdfe8e Skip invalid options Bernie Chiu 2013-09-25 14:46:55 +08:00
• 2a41e3440e Fixed Import data to import journal level types, fixed writing journal saurabhbhatia 2013-09-25 12:58:37 +08:00
• bad90e0abe Fix a word in module survey_b Manson Wang 2013-09-24 20:48:25 +08:00
• e29b08d0dc Journal title being imported correctly now saurabhbhatia 2013-09-24 17:13:00 +08:00
• 58fb2d1c73 external links and link widget fixed for development harrybomrah 2013-09-24 11:30:39 +08:00
• d5bb2a1889 Updated Books,Conference, Journal to display properly in the frontend saurabhbhatia 2013-09-24 15:07:49 +08:00
• 6d4d3ccfd4 for some reason can_display has been remove from announcement init. add it back. Matthew K. Fu JuYuan 2013-09-23 16:29:22 +08:00
• b535f2cf9c Updated Data import and sync code saurabhbhatia 2013-09-23 16:18:07 +08:00
• 0d1426cab8 add post request error checking and resend one more time thomaschen 2013-09-23 12:46:59 +08:00
• b57b899dba fix naming error thomaschen 2013-09-23 11:28:30 +08:00
• f2a27c6b40 Updated Import method in teachers to make all false positives. saurabhbhatia 2013-09-23 09:52:33 +08:00
• 9613a52305 Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix Spen 2013-09-18 17:31:53 +08:00
• a067bcd304 Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix Spen 2013-09-18 17:31:53 +08:00
• b487740035 Fixed Pagination Errors in member module saurabhbhatia 2013-09-18 16:10:39 +08:00
• dc8815d619 Fixed Pagination Errors in member module saurabhbhatia 2013-09-18 16:10:39 +08:00
• b5b416d531 add page completed with attributes and reordering harrybomrah 2013-09-17 15:11:59 +08:00