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

• 41c0c26330 Add mail_settings Christophe Vilayphiou 2012-05-09 11:38:29 +08:00
• 183104dd6d Fix i18 variable Matthew K. Fu JuYuan 2012-05-09 10:03:35 +08:00
• 4659941989 hidding new ad_banner Matthew K. Fu JuYuan 2012-05-09 09:49:27 +08:00
• b3be210ff7 Small adjustment for dashboard Christophe Vilayphiou 2012-05-09 05:55:47 +08:00
• 2b03263fb7 Dashboard partial implementation Christophe Vilayphiou 2012-05-09 05:53:07 +08:00
• 909ca19456 Fix bugs in sub_menu Christophe Vilayphiou 2012-05-09 04:31:04 +08:00
• 9ead6cafda Ray's changes Christophe Vilayphiou 2012-05-09 04:15:02 +08:00
• 8d70d87120 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-09 04:13:14 +08:00
• 26a50cc862 Add sub_menu to children Christophe Vilayphiou 2012-05-09 04:15:45 +08:00
• a186ae08d8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-08 21:47:03 +08:00
• 49e2eb0187 Add class 'active' in the menu for current page Christophe Vilayphiou 2012-05-08 21:46:24 +08:00
• 0cc94c65a8 Patch from ldap: Test version for DB sync schedule job Christophe Vilayphiou 2012-05-08 21:14:57 +08:00
• ffcfda912e Patch from ldap: Calendar sync done,need Ray's JS change Christophe Vilayphiou 2012-05-08 20:44:17 +08:00
• 3709d38621 Merge branch 'jobs_and_mail' of github.com:Rulingcom/orbit into jobs_and_mail Christophe Vilayphiou 2012-05-08 20:32:06 +08:00
• 7af17f19ac God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. Matthew K. Fu JuYuan 2012-05-08 11:31:35 +08:00
• dbac219c18 now jobs is working Matthew K. Fu JuYuan 2012-05-07 10:23:16 +08:00
• f3b58ea36d starting Resque Matthew K. Fu JuYuan 2012-04-13 12:10:47 +08:00
• f949523bbb God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. Matthew K. Fu JuYuan 2012-05-08 11:31:35 +08:00
• 69f2f6a716 now jobs is working Matthew K. Fu JuYuan 2012-05-07 10:23:16 +08:00
• c28d7d59b6 starting Resque Matthew K. Fu JuYuan 2012-04-13 12:10:47 +08:00
• 18c42a80a6 Put site_settings in the orbit_button Christophe Vilayphiou 2012-05-08 20:06:56 +08:00
• 083963af65 Test version for DB sync schedule job Matthew K. Fu JuYuan 2012-05-08 19:20:53 +08:00
• 23d2d9a81e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-08 17:36:35 +08:00
• 41424d2829 Fix error in front-end announcement index Christophe Vilayphiou 2012-05-08 17:40:14 +08:00
• d2e07f537a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-08 17:24:40 +08:00
• ef9afca19f Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-08 17:28:05 +08:00
• 55bfaea43e Can show announcement and news list by tag's key Christophe Vilayphiou 2012-05-08 17:27:42 +08:00
• 5c7cf1aef2 Add sub_menu to site_info Christophe Vilayphiou 2012-05-08 17:27:02 +08:00
• a3868cb785 Ray's changes for front-end banner Christophe Vilayphiou 2012-05-08 17:21:26 +08:00
• 7603cb91ad Change subrole's context from code to text at approval setting. Matthew K. Fu JuYuan 2012-05-08 16:21:10 +08:00
• f827e8429e Calendar sync done,need Ray's JS change Matthew K. Fu JuYuan 2012-05-08 16:08:41 +08:00
• caba8ce7a4 Add nccu icon Change news list in front-end Hide links and files in news and announcement front-end show when nothing Christophe Vilayphiou 2012-05-08 15:27:43 +08:00
• b22a275360 Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap Matthew K. Fu JuYuan 2012-05-08 11:55:21 +08:00
• 65a0998080 Merge branch 'jobs_and_mail' into ldap Christophe Vilayphiou 2012-05-08 11:45:34 +08:00
• d29b89ad1a Merge branch 'jobs_and_mail' of github.com:Rulingcom/orbit into jobs_and_mail Christophe Vilayphiou 2012-05-08 11:42:54 +08:00
• d7194dc805 God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. Matthew K. Fu JuYuan 2012-05-08 11:31:35 +08:00
• 5b604037f8 now jobs is working Matthew K. Fu JuYuan 2012-05-07 10:23:16 +08:00
• 7339d1ee4a starting Resque Matthew K. Fu JuYuan 2012-04-13 12:10:47 +08:00
• 2b9190a49e Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-08 11:40:38 +08:00
• 8ff36ee76c God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. Matthew K. Fu JuYuan 2012-05-08 11:31:35 +08:00
• ba4385e3fd Add module authorization for news Add files and links to announcement and news Change page.children into page.ordered_and_visible_children in parser_commom Christophe Vilayphiou 2012-05-08 10:50:09 +08:00
• 2aaff21000 Add missing class in widget news_bulletin/index Christophe Vilayphiou 2012-05-07 23:23:17 +08:00
• 2083e0bf4f widget structure improvised… Harry Bomrah 2012-05-07 19:00:50 +08:00
• ca88d0e01b Fix bug that was never displaying preview Christophe Vilayphiou 2012-05-07 17:29:56 +08:00
• 469f5c8267 Add always_display checkbox for title in site_info independent of i18n Christophe Vilayphiou 2012-05-07 16:29:32 +08:00
• 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-07 16:08:05 +08:00
• 4c7a3842d6 Add drop_down to news_bulletin widget index for categories Christophe Vilayphiou 2012-05-07 15:58:52 +08:00
• f534e6ca7b Ray's changes for site_info Christophe Vilayphiou 2012-05-07 15:55:45 +08:00
• 8a3f0b9bdc Add menu_enabled_for: the page can be shown even if there's no link in the menu Christophe Vilayphiou 2012-05-07 15:47:14 +08:00
• 8b61314cc4 Add i18n for site_info. Add always display site title. Changes for menu in front-end Christophe Vilayphiou 2012-05-07 15:11:43 +08:00
• e52119e258 Add footer parser Christophe Vilayphiou 2012-05-07 13:33:29 +08:00
• 0246341aef Add footer to site_info Christophe Vilayphiou 2012-05-07 11:25:33 +08:00
• a2277d7ea5 now jobs is working Matthew K. Fu JuYuan 2012-05-07 10:23:16 +08:00
• 1fb6c20b86 Add site_info Christophe Vilayphiou 2012-05-07 00:54:18 +08:00
• 48f8fbde7f Fix site_locale_default_head and active for current locale Christophe Vilayphiou 2012-05-07 00:53:52 +08:00
• 51f87e7212 Add missing translation for enabled_for Christophe Vilayphiou 2012-05-06 03:36:01 +08:00
• ce1fecaf93 Add position ordering and hiding page for i18n Christophe Vilayphiou 2012-05-06 00:35:13 +08:00
• f190ce18ee Put sorting in web_link, page_context and design Christophe Vilayphiou 2012-05-05 21:20:20 +08:00
• b48099d752 Fix bug in is_admin? Fix bug in helpers for news and announcement Christophe Vilayphiou 2012-05-05 17:40:07 +08:00
• fcc875bb5d app store page added… and few other changes.. Harry Bomrah 2012-05-04 20:28:12 +08:00
• 555aa088d9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-04 19:23:45 +08:00
• 3ef81c520e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-04 19:16:57 +08:00
• e0a191162d Ray's changes Christophe Vilayphiou 2012-05-04 19:11:28 +08:00
• 8e6fd277c2 Fix bug: preview was always true Christophe Vilayphiou 2012-05-04 19:02:40 +08:00
• e9b337a385 Copy changes into news after merge Christophe Vilayphiou 2012-05-04 18:49:07 +08:00
• 15bc4d4268 Fix merge error Christophe Vilayphiou 2012-05-04 16:12:28 +08:00
• 3bd3820519 Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust Christophe Vilayphiou 2012-05-04 15:59:26 +08:00
• 8f1ce78ab4 Fix bug when homepage Christophe Vilayphiou 2012-05-04 15:08:42 +08:00
• 119d8ff13a add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data. Matthew K. Fu JuYuan 2012-05-03 18:27:39 +08:00
• 048ce4c97e disable input Matthew K. Fu JuYuan 2012-05-03 15:48:42 +08:00
• 453cb21066 Announcement preivew Matthew K. Fu JuYuan 2012-05-03 14:57:10 +08:00
• f6307abfbf fix broken ad_banner Matthew K. Fu JuYuan 2012-05-01 18:23:42 +08:00
• bff3cefbc7 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. Matthew K. Fu JuYuan 2012-05-01 16:05:05 +08:00
• f427c3803f clean up useless flash msgs. add i18n vars for app auth and object auth Matthew K. Fu JuYuan 2012-04-30 15:51:22 +08:00
• 05ded8de03 Fix for NCCU 0430 all functions ok with two submanagers but different behavors Matthew K. Fu JuYuan 2012-04-30 03:14:15 +08:00
• 4dc82e91a0 Merge branch 'desktop_devin' into desktop_harry Harry Bomrah 2012-05-03 21:41:20 +08:00
• 49ab5bd858 minor update Harry Bomrah 2012-05-03 21:40:40 +08:00
• 3ad11f2098 View functionality, changed controller, journal and pages collections Harry Bomrah 2012-05-03 21:38:03 +08:00
• a3a1e4b92e controller change, views working and db for paper and journals Harry Bomrah 2012-05-03 21:30:12 +08:00
• b89975b4c4 add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data. Matthew K. Fu JuYuan 2012-05-03 18:27:39 +08:00
• aeaf2f05d1 Start Add Page - no function devin 2012-05-03 17:59:07 +08:00
• eb81aa6980 disable input Matthew K. Fu JuYuan 2012-05-03 15:48:42 +08:00
• 2a14c8bad4 Announcement preivew Matthew K. Fu JuYuan 2012-05-03 14:57:10 +08:00
• 1fce99c96f Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-05-03 14:42:07 +08:00
• d6cbbff9de connection page working now.. Harry Bomrah 2012-05-03 14:40:54 +08:00
• b87cf0e2ff list page devin 2012-05-03 14:39:22 +08:00
• 45e21f9569 Fix filter category in news Christophe Vilayphiou 2012-05-02 17:55:02 +08:00
• 6b8c79a9a8 Merge branch 'desktop_devin' into desktop_harry Harry Bomrah 2012-05-02 17:06:56 +08:00
• 5b7c422446 position update fixed.. Harry Bomrah 2012-05-02 17:05:40 +08:00
• 887bda1491 lots of change devin 2012-05-02 17:04:16 +08:00
• b8cd7097b0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-02 16:27:09 +08:00
• 2762c24593 Fix wrong variable names in translations Christophe Vilayphiou 2012-04-26 19:38:16 +08:00
• 92a53c1b27 Ray's fix Christophe Vilayphiou 2012-05-02 16:20:59 +08:00
• de457e7dfc fix broken ad_banner Matthew K. Fu JuYuan 2012-05-01 18:23:42 +08:00
• bfc4507696 Connection page design devin 2012-05-01 18:05:17 +08:00
• 7a5d3ecae3 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. Matthew K. Fu JuYuan 2012-05-01 16:05:05 +08:00
• 769a67f026 the group more structured and also demo connecting with gmail account.. Harry Bomrah 2012-04-30 21:17:20 +08:00
• a803309380 clean up useless flash msgs. add i18n vars for app auth and object auth Matthew K. Fu JuYuan 2012-04-30 15:51:22 +08:00
• 1b7fb106f8 lot of updates Harry Bomrah 2012-04-30 14:33:12 +08:00
• aacd9da9fb auto login encryption done… Harry Bomrah 2012-04-30 14:29:42 +08:00