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

• c5fdff764e orbit disable object for categories Matthew K. Fu JuYuan 2012-07-05 16:00:45 +08:00
• 6923b82284 Added seminar section Harry Bomrah 2012-07-04 19:12:02 +08:00
• f635f642fc Merge for new timeline updates and font updates Harry Bomrah 2012-07-04 18:49:10 +08:00
• 441929eb74 Latest code by joshua Joshua Milton 2012-07-04 18:39:28 +08:00
• 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua Joshua Milton 2012-07-04 18:31:00 +08:00
• edef51d58c DM for archive bulletin categroy Matthew K. Fu JuYuan 2012-07-04 17:56:51 +08:00
• 3f42a22094 Books section added Joshua Milton 2012-07-04 17:55:30 +08:00
• 32480e10ed en translation Matthew K. Fu JuYuan 2012-07-04 17:43:52 +08:00
• ae2cbb728e archive for announcement Matthew K. Fu JuYuan 2012-07-04 17:36:51 +08:00
• e133673736 some change devin 2012-07-04 13:35:24 +08:00
• a0c09046a8 Timeline merge plus font update Harry Bomrah 2012-07-03 19:53:34 +08:00
• f20f36383e Timeline ajax load fixed… a bit change in structure.. Harry Bomrah 2012-07-03 19:45:47 +08:00
• f7107936d0 fix for checking @rulingcom.com Matthew K. Fu JuYuan 2012-07-03 18:21:48 +08:00
• 9607b5bbfd rulingcom帳號不透過LDAP認證 Matthew K. Fu JuYuan 2012-07-03 18:12:44 +08:00
• d0632b2e4c change name format Matthew K. Fu JuYuan 2012-07-03 16:05:19 +08:00
• 56ecf9c69b remove remember for nccu Matthew K. Fu JuYuan 2012-07-03 15:59:25 +08:00
• 4fe92b844e Add sorting order for NCCU request Matthew K. Fu JuYuan 2012-07-03 15:47:28 +08:00
• 4014f8ee47 fix over queue at resque Matthew K. Fu JuYuan 2012-07-03 10:51:26 +08:00
• bacb1f1e63 Timeline ajax loading Harry Bomrah 2012-07-02 21:06:20 +08:00
• f34cb47618 font aweosme change devin 2012-07-02 16:23:14 +08:00
• 08fd07b6aa timeline and font update devin 2012-07-02 16:22:51 +08:00
• 6533abf214 font awesome update devin 2012-07-02 11:10:01 +08:00
• 15cdb54599 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site babel Christophe Vilayphiou 2012-06-29 18:36:36 +08:00
• 43c38bc940 demo unknown 2012-06-26 14:42:18 +08:00
• 6b15a03f1f demo unknown 2012-06-26 14:31:29 +08:00
• 3a6cd92e87 demo website widget unknown 2012-06-25 15:38:32 +08:00
• 1278581a82 add rescue job . can work with init script Matthew K. Fu JuYuan 2012-06-29 17:42:36 +08:00
• a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry Christophe Vilayphiou 2012-06-29 16:10:29 +08:00
• c0b3798bad fix for date for qu menu Matthew K. Fu JuYuan 2012-06-29 11:41:06 +08:00
• f66c3d9c0c fix bugs. Matthew K. Fu JuYuan 2012-06-29 11:17:35 +08:00
• 3542e58869 Merge branch 'desktop_devin' into desktop_joshua Harry Bomrah 2012-06-28 17:33:32 +08:00
• 7151102a86 new page add and timeline changes Harry Bomrah 2012-06-28 17:31:48 +08:00
• 6c4c1046bc fix date select cause error back to the time of Jesus Matthew K. Fu JuYuan 2012-06-28 15:19:51 +08:00
• 58a11ff569 fix javascript for new and anc link removing Matthew K. Fu JuYuan 2012-06-28 13:50:11 +08:00
• 243c9e2946 fix relation between bulletin and category (news also) Matthew K. Fu JuYuan 2012-06-27 15:16:16 +08:00
• 04a23db745 fix invalid invalid byte sequence in US-ASCII for js files Matthew K. Fu JuYuan 2012-06-27 14:27:27 +08:00
• 55449efb35 fix 新聞與公告QA 1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除 2.優先處理-編輯中的檔案列表，無法刪除 3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除 Matthew K. Fu JuYuan 2012-06-27 14:21:06 +08:00
• 4c4929c20a Fix js for news quick_edit and edit for files Christophe Vilayphiou 2012-06-27 11:36:18 +08:00
• 6a4abc6c43 fix news error Matthew K. Fu JuYuan 2012-06-27 09:59:32 +08:00
• 32d1f8840c Merge branch 'desktop_harry' into desktop_joshua Harry Bomrah 2012-06-26 21:11:19 +08:00
• 4aa155a44d timeline updates major ones.. Harry Bomrah 2012-06-26 21:09:33 +08:00
• 83a72bdf6e fix for announcement Matthew K. Fu JuYuan 2012-06-26 18:23:44 +08:00
• 818c58c1ee fix for 新聞與公告QA 1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示） 2.add 上傳檔案大小限制: 3MB 3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位 Matthew K. Fu JuYuan 2012-06-26 17:46:02 +08:00
• e8c3a1b904 Joshua branch update Harry Bomrah 2012-06-26 17:04:50 +08:00
• 8c7a0fdf0a test Joshua Milton 2012-06-26 16:59:29 +08:00
• df722ba90f change display of user dept for showing announcement Matthew K. Fu JuYuan 2012-06-26 16:21:18 +08:00
• 555ec86403 Timeline commit Harry Bomrah 2012-06-26 15:59:28 +08:00
• 9aea2824b9 demo unknown 2012-06-26 14:42:18 +08:00
• 0c48664af0 demo unknown 2012-06-26 14:31:29 +08:00
• 2b54067ecb change order of display menu of categories of news_bulletin and bulletin. Matthew K. Fu JuYuan 2012-06-26 14:28:21 +08:00
• 56b1bd9eaa add translation Matthew K. Fu JuYuan 2012-06-26 10:57:51 +08:00
• 73fbed8837 fix 1.page_content user empty problem 2.add i18n variable for news and announcement Matthew K. Fu JuYuan 2012-06-26 10:04:40 +08:00
• ffd95ee1fd fix 新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人，應該只能看到自己發佈的新聞&公告，但是目前可以看到全部，而且可以刪除其他人的公告.至少要不能刪除別人的公告 新聞與公告QA-編輯問題-發佈新聞時，發佈單位預設為請選擇 新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位 put rb-readline only in Linux make app_manager destroy after user deletion. may need to run: AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy} for clean up DB. Matthew K. Fu JuYuan 2012-06-25 16:23:16 +08:00
• db571d2c65 demo website widget unknown 2012-06-25 15:38:32 +08:00
• a36f73bafc fix 0621 Trello:"171 頁面管理不能使用" Matthew K. Fu JuYuan 2012-06-22 18:19:40 +08:00
• 86a4a6cbe2 put ldap setting into config file. should load be rails env. Also make god config more friendly. Matthew K. Fu JuYuan 2012-06-22 14:32:28 +08:00
• 3f95fe4f13 tmp commit for search. start nccu0621 first Matthew K. Fu JuYuan 2012-06-22 11:34:10 +08:00
• cb17fe0825 Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working Matthew K. Fu JuYuan 2012-06-20 14:50:51 +08:00
• 7f0267aedd have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables Harry Bomrah 2012-06-04 18:00:06 +08:00
• 8dd1ab32c1 Add this toolbar, and nccu calendar fix Matthew K. Fu JuYuan 2012-06-04 16:51:29 +08:00
• c1c9cca952 Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg Christophe Vilayphiou 2012-05-29 17:19:17 +08:00
• 11247ce84c Clean up code , cache other auths. Fix sidebar Matthew K. Fu JuYuan 2012-05-23 13:00:51 +08:00
• 4d288fb9d1 add script for cache user Matthew K. Fu JuYuan 2012-05-22 17:57:45 +08:00
• 1f1868a75f cache privilege user list. Matthew K. Fu JuYuan 2012-05-22 17:55:18 +08:00
• 2f500ff460 For non-login user,show no drop down menu and return to home after press orbit button. Matthew K. Fu JuYuan 2012-05-29 16:33:38 +08:00
• 4f484599b7 Clean up code , cache other auths. Fix sidebar Matthew K. Fu JuYuan 2012-05-23 13:00:51 +08:00
• ff620b41aa add script for cache user Matthew K. Fu JuYuan 2012-05-22 17:57:45 +08:00
• 6f0cf0e92e cache privilege user list. Matthew K. Fu JuYuan 2012-05-22 17:55:18 +08:00
• 7488341836 Commit for app window.. Harry Bomrah 2012-05-25 15:41:07 +08:00
• a663231c8c Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-25 10:01:41 +08:00
• 75b67dddf5 Fix date bugs Christophe Vilayphiou 2012-05-25 09:59:39 +08:00
• 3480fa2545 Fix login and label. Check sync jobs and update info function. Matthew K. Fu JuYuan 2012-05-24 17:01:00 +08:00
• 20eb8b4d15 Clean up code , cache other auths. Fix sidebar Matthew K. Fu JuYuan 2012-05-23 13:00:51 +08:00
• c062b43069 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-23 12:11:38 +08:00
• 71d4241a2f Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-23 12:11:26 +08:00
• 006b84f6a1 Ray's fix for ie Christophe Vilayphiou 2012-05-23 12:06:09 +08:00
• 7c44e94285 Order list by created_at desc Add best image size in news new Christophe Vilayphiou 2012-05-23 11:46:19 +08:00
• f1c8bed29d Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-22 20:33:07 +08:00
• eab82269c1 Remove seconds from date display Christophe Vilayphiou 2012-05-22 20:19:04 +08:00
• d6b92fc604 Fixed bugs for nccu Christophe Vilayphiou 2012-05-22 20:00:07 +08:00
• 3e60b34491 add script for cache user Matthew K. Fu JuYuan 2012-05-22 17:57:45 +08:00
• 11a371cbb9 Fix destroy in structure Fix sorting Christophe Vilayphiou 2012-05-22 17:55:45 +08:00
• 97e289f823 cache privilege user list. Matthew K. Fu JuYuan 2012-05-22 17:55:18 +08:00
• 541aa5831e JS changes to load drag and drop Christophe Vilayphiou 2012-05-22 17:37:15 +08:00
• 1c35e38097 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-22 16:54:35 +08:00
• dd4c1697cd Fix bug when object_auth was only built but not created Christophe Vilayphiou 2012-05-22 16:52:12 +08:00
• 874a89d99b Ray's fix for structure side_bar Christophe Vilayphiou 2012-05-22 16:48:57 +08:00
• f497851fe3 Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg Christophe Vilayphiou 2012-05-22 16:12:00 +08:00
• e0260542d3 fix code Matthew K. Fu JuYuan 2012-05-22 15:54:46 +08:00
• d0b030c47d Put inc/ajax_setting in new_admin Fix callback for link on save Christophe Vilayphiou 2012-05-22 16:11:00 +08:00
• 1bbf89a354 fix code Matthew K. Fu JuYuan 2012-05-22 15:54:46 +08:00
• ef72a2330c Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg Christophe Vilayphiou 2012-05-22 15:00:37 +08:00
• 99bcdf6e1e clean up unless code Matthew K. Fu JuYuan 2012-05-22 13:23:26 +08:00
• 79f67208fa js for preventing user do stupid things durning ajax Matthew K. Fu JuYuan 2012-05-22 13:22:24 +08:00
• 361722f252 fix orbit core to adopt current user behavior Matthew K. Fu JuYuan 2012-05-22 11:17:50 +08:00
• 70b5654b35 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-22 14:47:40 +08:00
• 5e9836f371 Changes for structure Christophe Vilayphiou 2012-05-22 14:45:49 +08:00
• 27cf99462e Fix bug in page and news Christophe Vilayphiou 2012-05-22 14:42:19 +08:00
• 7f3b090bb7 clean up unless code Matthew K. Fu JuYuan 2012-05-22 13:23:26 +08:00
• ae006cc29f js for preventing user do stupid things durning ajax Matthew K. Fu JuYuan 2012-05-22 13:22:24 +08:00