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

• 3f744dab05 First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued Matthew K. Fu JuYuan 2012-05-15 18:55:16 +08:00
• b23b5e8ec5 Object auth for ad_banner Matthew K. Fu JuYuan 2012-05-15 16:39:23 +08:00
• 77deffb512 Nccu calendar and daily job. Matthew K. Fu JuYuan 2012-05-15 14:03:54 +08:00
• 848d935d23 Remove unless config file Matthew K. Fu JuYuan 2012-05-15 11:37:45 +08:00
• 551e1ef740 Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly. Matthew K. Fu JuYuan 2012-05-15 11:28:24 +08:00
• 0a9f0bcc45 starting ad_banner auth Matthew K. Fu JuYuan 2012-05-15 09:57:05 +08:00
• 8fcb8ef8de Change the way links are displayed in menus in front-end Christophe Vilayphiou 2012-05-14 21:43:10 +08:00
• f8baa9e26c Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-14 12:44:09 +08:00
• 59b55d1574 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-14 12:42:06 +08:00
• 6c83b3f9ae Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-14 12:41:14 +08:00
• 9ba4c2cf2f Change to apply page to had object_auth Matthew K. Fu JuYuan 2012-05-14 12:34:15 +08:00
• 2cd67356a5 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 Matthew K. Fu JuYuan 2012-05-14 12:36:09 +08:00
• e1450ec748 Change to apply page to had object_auth Matthew K. Fu JuYuan 2012-05-14 12:34:15 +08:00
• 852314c17c Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-14 09:32:28 +08:00
• 1ecdb91778 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-14 09:31:44 +08:00
• f0dd1eb871 Fix designs.rake Christophe Vilayphiou 2012-05-14 09:30:49 +08:00
• b6f3f3d689 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-14 09:08:55 +08:00
• 9837f8eae7 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-14 09:07:36 +08:00
• 33e3821e61 Rake task to change design_ids Christophe Vilayphiou 2012-05-14 08:59:53 +08:00
• 0c2a634922 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-14 01:08:23 +08:00
• ebc8dd33ec Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-14 00:57:17 +08:00
• 039e837fff Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-14 00:51:53 +08:00
• b804ba4d96 Fix for manager and admin can see all post in announcement. Haven't applied to news Matthew K. Fu JuYuan 2012-05-11 17:07:21 +08:00
• dfd2d82efb Restart job Matthew K. Fu JuYuan 2012-05-11 16:56:32 +08:00
• 7a6d30ad62 Remove unless files and change routes. Matthew K. Fu JuYuan 2012-05-11 16:46:36 +08:00
• 0119ab1a74 New Interface for App Auth and Object Auth Matthew K. Fu JuYuan 2012-05-11 16:44:40 +08:00
• a184f96ce7 AdBanner app_auth Matthew K. Fu JuYuan 2012-05-10 15:37:07 +08:00
• 8b42c595b3 Don't display admin in any premission select. Fix not necessary header for UT data Matthew K. Fu JuYuan 2012-05-10 14:43:05 +08:00
• cf8d20dc84 Add category and tag to pages Christophe Vilayphiou 2012-05-14 00:33:52 +08:00
• e40c76bf5f Fix new page form Redirect to home when not authorized Get only module_apps with app_pages for new and edit page Change web_resource.json Christophe Vilayphiou 2012-05-13 23:48:34 +08:00
• 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-13 23:14:13 +08:00
• 62e9a772f6 Fix titles for widgets Add translations Christophe Vilayphiou 2012-05-13 23:09:48 +08:00
• 4ae8299949 Add custom title to widgets Fix pagination conflict with main_content and widgets Christophe Vilayphiou 2012-05-13 22:35:00 +08:00
• 281cfa6518 Changes for widgets Christophe Vilayphiou 2012-05-13 21:55:39 +08:00
• 4685952bd6 Changes in page_edit Christophe Vilayphiou 2012-05-13 20:13:26 +08:00
• ef2d416c70 Ray's changes for page_edit Christophe Vilayphiou 2012-05-13 19:36:04 +08:00
• 82fa85def8 Clean the parsers code Christophe Vilayphiou 2012-05-13 19:32:05 +08:00
• 803253ebcf Put nestedSortable in page_edit.js.erb Christophe Vilayphiou 2012-05-12 22:12:17 +08:00
• ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-11 18:09:34 +08:00
• 17b486f9e9 Fix bugs for shift_to and change items.rake for the missing position in db Christophe Vilayphiou 2012-05-11 17:56:26 +08:00
• 076f5ad6ef Ray's changes for drag and drop in structure's side_bar Christophe Vilayphiou 2012-05-11 17:54:33 +08:00
• e696516aae Fix for manager and admin can see all post in announcement. Haven't applied to news Matthew K. Fu JuYuan 2012-05-11 17:07:21 +08:00
• 82d1d3fed8 Restart job Matthew K. Fu JuYuan 2012-05-11 16:56:32 +08:00
• 0a34f0277e Remove unless files and change routes. Matthew K. Fu JuYuan 2012-05-11 16:46:36 +08:00
• 20a1a6e30f New Interface for App Auth and Object Auth Matthew K. Fu JuYuan 2012-05-11 16:44:40 +08:00
• 6a443f0976 Add mongoid-tree to Item Christophe Vilayphiou 2012-05-11 16:16:09 +08:00
• 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-05-11 15:28:05 +08:00
• 2c3637e9b4 very important update for widgets management.. Harry Bomrah 2012-05-11 15:27:16 +08:00
• fd52d00187 Add drag and drop to structure side_bar Christophe Vilayphiou 2012-05-11 10:00:45 +08:00
• 63f904d3b0 Fix tinymce js load Change to full_name for page_context index Christophe Vilayphiou 2012-05-10 20:36:19 +08:00
• 97b60c48b2 update devin 2012-05-10 17:41:56 +08:00
• cb25cf60a9 AdBanner app_auth Matthew K. Fu JuYuan 2012-05-10 15:37:07 +08:00
• 4f1e47bb82 Don't display admin in any premission select. Fix not necessary header for UT data Matthew K. Fu JuYuan 2012-05-10 14:43:05 +08:00
• 1c77cb5c42 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-10 14:19:55 +08:00
• 5eba2638ce Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-10 14:17:38 +08:00
• 14c2c4e5e8 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-10 14:17:03 +08:00
• b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. Matthew K. Fu JuYuan 2012-05-10 11:51:44 +08:00
• 87ebcc48e7 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. Matthew K. Fu JuYuan 2012-05-10 11:51:44 +08:00
• ada56a7a63 some update devin 2012-05-10 10:54:43 +08:00
• ea79246f83 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-10 10:35:07 +08:00
• 87449ec6a8 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-10 10:34:28 +08:00
• a43877323e Add tinymce to page_part edit for text Christophe Vilayphiou 2012-05-10 10:34:13 +08:00
• 2677054de7 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-10 10:29:41 +08:00
• 07815eee8f fix display for announcement and remove ut field Matthew K. Fu JuYuan 2012-05-10 10:27:01 +08:00
• 99c4e94729 Fix for home_list widget Christophe Vilayphiou 2012-05-10 10:28:29 +08:00
• f13e006e4d fix display for announcement and remove ut field Matthew K. Fu JuYuan 2012-05-10 10:27:01 +08:00
• f9d66687c1 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-10 00:43:43 +08:00
• 64effbd83c Remove extra widgets declaration Christophe Vilayphiou 2012-05-10 00:41:32 +08:00
• 3a563dde8b Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-10 00:35:28 +08:00
• de739d7d20 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-10 00:34:23 +08:00
• bc5e975fab Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-10 00:29:22 +08:00
• 9161dc73b5 Translation for "or" Christophe Vilayphiou 2012-05-10 00:27:12 +08:00
• 13587306bc Add list widgets for announcement, news and links with categories and tags Christophe Vilayphiou 2012-05-10 00:25:30 +08:00
• ecd21338bc Matt's changes for side_bar Christophe Vilayphiou 2012-05-10 00:23:42 +08:00
• 6727f27181 Change for 0509 Nccu check Christophe Vilayphiou 2012-05-09 16:58:12 +08:00
• 9a6b66c57d Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 Matthew K. Fu JuYuan 2012-05-09 15:54:59 +08:00
• 93946c37f4 fix wrong link Matthew K. Fu JuYuan 2012-05-09 15:54:00 +08:00
• 8eaceb971a Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-09 15:28:37 +08:00
• a9c241658a Repeat code for news module Matthew K. Fu JuYuan 2012-05-09 15:22:15 +08:00
• c82d701b55 Permission setting for announcement for bulletin cate Matthew K. Fu JuYuan 2012-05-09 14:54:20 +08:00
• cca2b8fd6c Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-09 15:26:03 +08:00
• dc9af65524 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-09 15:25:16 +08:00
• 618e4f4047 Repeat code for news module Matthew K. Fu JuYuan 2012-05-09 15:22:15 +08:00
• 038378be9a Ray's changes for inccu in orbit_bar Christophe Vilayphiou 2012-05-09 15:20:09 +08:00
• 695b779e4b Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-09 15:04:52 +08:00
• 1785da51a2 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-09 15:04:06 +08:00
• 50edfdd02f Changes for tag key in side_bar announcement and news, fix ad_banner css for dot Christophe Vilayphiou 2012-05-09 14:59:06 +08:00
• 71a5731fe8 Permission setting for announcement for bulletin cate Matthew K. Fu JuYuan 2012-05-09 14:54:20 +08:00
• 0bcfac8177 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-09 14:22:09 +08:00
• 9d01f624da Merge branches 'nccu_0509' and 'design_team' into ldap Christophe Vilayphiou 2012-05-09 14:21:24 +08:00
• ec8afc1341 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-09 14:20:38 +08:00
• 6c9944918a Fix i18 variable Matthew K. Fu JuYuan 2012-05-09 10:03:35 +08:00
• 47bca643af hidding new ad_banner Matthew K. Fu JuYuan 2012-05-09 09:49:27 +08:00
• 69187df279 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-09 14:00:23 +08:00
• e4c41a9310 Test version for DB sync schedule job Matt 2012-05-09 13:58:19 +08:00
• d88d4e58dc Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-09 13:51:00 +08:00
• f9f7ddc8ee Hide some links in side_bar for site_settings Christophe Vilayphiou 2012-05-09 12:53:42 +08:00
• 3a38992f29 Ray's changes for mail_setting i18n Christophe Vilayphiou 2012-05-09 12:45:27 +08:00
• 44a485611a Site_info and site_setting i18n Christophe Vilayphiou 2012-05-09 12:29:46 +08:00
• 9216f29bc9 Ray's changes for mail settings Christophe Vilayphiou 2012-05-09 12:19:32 +08:00