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

• e05cf2a2d6 fix orbit core to adopt current user behavior Matthew K. Fu JuYuan 2012-05-22 11:17:50 +08:00
• aa114568c4 Move design to site_settings side_bar Christophe Vilayphiou 2012-05-21 18:20:39 +08:00
• c4d7079059 Fix's Matt code for not showing bulletins in index Christophe Vilayphiou 2012-05-21 18:10:03 +08:00
• 6fedf7232a app update devin 2012-05-21 15:45:07 +08:00
• 81ff0f2c1c Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-05-21 15:26:38 +08:00
• a78b72ebfc app update devin 2012-05-21 15:25:18 +08:00
• dfe7ccf166 general commit Harry Bomrah 2012-05-21 15:24:47 +08:00
• ab7ae6dcee app devin 2012-05-21 14:55:51 +08:00
• 815e6a8361 Fix matt's code and add it to filters Christophe Vilayphiou 2012-05-19 03:19:55 +08:00
• dc4116bc3d Fix page hits count Christophe Vilayphiou 2012-05-19 01:59:17 +08:00
• db410b9c50 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-18 19:44:18 +08:00
• 4d33c7a56d Changes for dat and time format Impression bug when some i18n missing in impressionable object JS bug in ad_banner edit title Christophe Vilayphiou 2012-05-18 19:42:36 +08:00
• 661fcafe70 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team Matthew K. Fu JuYuan 2012-05-18 18:50:10 +08:00
• 6ce6577e83 fix news approve and preview Matthew K. Fu JuYuan 2012-05-18 18:47:18 +08:00
• e1bd5d8c8d Put back db prototype_r4_development Christophe Vilayphiou 2012-05-18 16:46:47 +08:00
• 6a022c90da Changes on nccu Matt 2012-05-18 15:20:45 +08:00
• a4c5c8225f Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-18 14:19:43 +08:00
• 5f6696a358 fix view for different_user for ad_banner. add field 'best size' for ad_banner within form Matthew K. Fu JuYuan 2012-05-18 10:50:53 +08:00
• 7c6b807170 Change impression count to exclude when :referrer is nil Christophe Vilayphiou 2012-05-18 14:13:11 +08:00
• 1d9fc7eb75 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 Matthew K. Fu JuYuan 2012-05-18 10:52:16 +08:00
• 2c16284f73 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-18 10:51:49 +08:00
• f72d0bc7e0 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-18 10:51:20 +08:00
• 0306277c3d fix view for different_user for ad_banner. add field 'best size' for ad_banner within form Matthew K. Fu JuYuan 2012-05-18 10:50:53 +08:00
• d9c12ea5a4 Proof authed_users for case when no category Christophe Vilayphiou 2012-05-18 10:50:51 +08:00
• 746f71dfee Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-18 10:37:40 +08:00
• a4afd5c1d3 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-18 10:36:32 +08:00
• 8ad7f70822 Proof i18n_variable for categories Christophe Vilayphiou 2012-05-18 10:28:28 +08:00
• 69af2b7b5a Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 23:41:54 +08:00
• cdff75b133 Merge branch 'nccu_0509' into ldap Christophe Vilayphiou 2012-05-17 23:41:08 +08:00
• a2637008e0 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-17 23:40:11 +08:00
• 27fd48b730 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 23:37:15 +08:00
• 17b6a70506 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 23:36:24 +08:00
• 16ada34585 fix ad_banner. new ad_image with best size from ad_banner. content editable at tab Matthew K. Fu JuYuan 2012-05-17 21:31:29 +08:00
• 5d5e798b1a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-17 23:35:14 +08:00
• a0ad1f59b6 Comment out filename in FIleAssetUploader Christophe Vilayphiou 2012-05-17 23:34:15 +08:00
• 4013436027 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 Matthew K. Fu JuYuan 2012-05-17 21:32:26 +08:00
• 4981898266 fix ad_banner. new ad_image with best size from ad_banner. content editable at tab Matthew K. Fu JuYuan 2012-05-17 21:31:29 +08:00
• 1b1c2c0032 image title and description callback fixed… Harry Bomrah 2012-05-17 20:19:31 +08:00
• 4153820dba Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 19:41:51 +08:00
• 60988f97fb Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 19:41:24 +08:00
• 2f7d561310 Put back I18n for file_upload Christophe Vilayphiou 2012-05-17 19:40:30 +08:00
• 9e6ea0b8dc Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 19:11:22 +08:00
• 25de941df7 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 19:10:22 +08:00
• 606050627e Remove I18n for file_upload html Christophe Vilayphiou 2012-05-17 19:09:52 +08:00
• 5720de2e55 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 18:38:17 +08:00
• 698c750cd7 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 18:37:56 +08:00
• 27fd2d0714 Hide assets links from side_bar Christophe Vilayphiou 2012-05-17 18:37:46 +08:00
• 79f484300e Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 18:32:06 +08:00
• c9cbec4239 Asset changes, add description Christophe Vilayphiou 2012-05-17 18:31:40 +08:00
• 0d69403f4a Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 16:42:07 +08:00
• 5e93fe51a9 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 16:41:11 +08:00
• 29c54e6480 Add mandatory fields to assets Christophe Vilayphiou 2012-05-17 16:40:09 +08:00
• d1d25a12a1 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 10:00:35 +08:00
• 1e2b146c21 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 10:00:07 +08:00
• 4467bc5e48 Change Date to DateTime Fix filename error Christophe Vilayphiou 2012-05-17 09:59:49 +08:00
• e9dde4cefe Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 09:32:57 +08:00
• bfad553cc3 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 09:31:02 +08:00
• 84dac1d250 Create FileAssetUploader Christophe Vilayphiou 2012-05-17 09:30:21 +08:00
• 3d08bd48de Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 06:47:03 +08:00
• eba4671733 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 06:46:29 +08:00
• cd1640482a Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Christophe Vilayphiou 2012-05-17 06:45:30 +08:00
• 0f354b8ccc fix ad_image size hints. fix orbit backend controller error when changing language. Matthew K. Fu JuYuan 2012-05-16 17:16:48 +08:00
• a3acd865d7 AdBanner reopen new banner and delete. Rename title with content editable tag. Matthew K. Fu JuYuan 2012-05-16 16:42:43 +08:00
• 7f2564a81e Fix sidebar and hide some links by roles Matthew K. Fu JuYuan 2012-05-16 12:10:16 +08:00
• 82d78acbad 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
• 03387d3c07 Object auth for ad_banner Matthew K. Fu JuYuan 2012-05-15 16:39:23 +08:00
• f663985a40 starting ad_banner auth Matthew K. Fu JuYuan 2012-05-15 09:57:05 +08:00
• d5bb48ef58 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-17 06:33:03 +08:00
• 6b9c8eb15d Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-17 06:31:57 +08:00
• c35cd2e3a6 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-17 06:31:07 +08:00
• b05836835a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-17 06:28:49 +08:00
• 26292f0dcc Asset upload Christophe Vilayphiou 2012-05-17 06:28:29 +08:00
• aab030efa9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-17 06:26:21 +08:00
• be7ce0bf45 Redmine change's Christophe Vilayphiou 2012-05-17 06:25:38 +08:00
• 27a0984da1 tinymce loading fixed… Harry Bomrah 2012-05-16 18:51:37 +08:00
• 9129835f23 Add tags to assets Christophe Vilayphiou 2012-05-16 18:19:41 +08:00
• 0647698012 fix ad_image size hints. fix orbit backend controller error when changing language. Matthew K. Fu JuYuan 2012-05-16 17:16:48 +08:00
• befd3bcdec AdBanner reopen new banner and delete. Rename title with content editable tag. Matthew K. Fu JuYuan 2012-05-16 16:42:43 +08:00
• 617a683d00 image insertion completed.. Harry Bomrah 2012-05-16 16:22:50 +08:00
• c380c4cad0 popup fixed Harry Bomrah 2012-05-16 15:34:23 +08:00
• 30137b50b4 popup fix.. Harry Bomrah 2012-05-16 15:33:54 +08:00
• a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 Matthew K. Fu JuYuan 2012-05-16 12:13:07 +08:00
• 88a26cc6a1 Fix sidebar and hide some links by roles Matthew K. Fu JuYuan 2012-05-16 12:10:16 +08:00
• 75cbae049b few experiments… Harry Bomrah 2012-05-16 11:18:54 +08:00
• 0b0916179f Change assets Christophe Vilayphiou 2012-05-16 11:07:11 +08:00
• b31846f424 Delete duplicate side_bar code Christophe Vilayphiou 2012-05-16 04:35:19 +08:00
• ad9ac5f3f7 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-05-16 01:31:16 +08:00
• ab616fc3b5 announcement edit to view file unknown 2012-04-24 15:18:29 +08:00
• cc02ea511c archive checkbox unknown 2012-04-23 15:53:58 +08:00
• cf5e6c1a96 new archive unknown 2012-04-13 15:24:19 +08:00
• 4e9bb1b583 new archive unknown 2012-04-13 15:24:19 +08:00
• f1941f1fc5 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap Matt 2012-05-15 23:09:17 +08:00
• f950f77f36 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-05-15 23:02:22 +08:00
• 80e84c10ba Remove link from dashboard Christophe Vilayphiou 2012-05-15 23:01:00 +08:00
• 42881553a8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-05-15 22:48:40 +08:00
• 5e9b55e08e Ray took out 'default' tags Christophe Vilayphiou 2012-05-15 22:47:28 +08:00
• a8c1cbdbba Add vendor/impressionist Christophe Vilayphiou 2012-05-15 22:42:49 +08:00
• 3462c0e319 Add each page name to page_context index Christophe Vilayphiou 2012-05-15 21:31:54 +08:00
• e54f4409fb Add impressionist Christophe Vilayphiou 2012-05-15 21:26:09 +08:00
• 53a0fbddf0 Fix commit error Christophe Vilayphiou 2012-05-15 21:25:51 +08:00