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

• 7595e20d0c fixed language of announcement filter Rueshyna 2012-11-08 16:01:08 +08:00
• 800279ea69 add get_bulletins_json function Rueshyna 2012-11-08 15:56:14 +08:00
• e6a9555dd8 refine the location module done Rueshyna 2012-11-08 12:34:26 +08:00
• dbfc70e520 Refine the location module, but it have some bugs about path ... Rueshyna 2012-11-08 01:26:33 +08:00
• 11fefa100f all of user can get json of gprs from outside Rueshyna 2012-11-08 01:24:37 +08:00
• b4f5a0b04b all of user can get json of gallery from outside Rueshyna 2012-11-08 01:24:01 +08:00
• 43d969a72b Fix attribute_field_helper and comment admin in I18n chris 2012-11-06 17:51:42 +08:00
• 97d2380406 Merge branch 'new' of https://github.com/Rulingcom/orbit into new unknown 2012-11-06 14:28:03 +08:00
• b9c8d9d657 plugin edit unknown 2012-11-06 14:26:37 +08:00
• 12f5d93e1a Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-06 12:35:34 +08:00
• eaf465525a rake update Harry Bomrah 2012-11-06 12:17:09 +08:00
• 23e86bfe31 Fix bug due to change of structure for stylesheet chris 2012-11-06 12:33:00 +08:00
• 16e5473418 rake update Harry Bomrah 2012-11-06 12:17:09 +08:00
• b40d4702d5 Merge branch 'master' into various_bugs chris 2012-11-06 11:44:00 +08:00
• 159e41639d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-06 10:36:52 +08:00
• da5e7f670e Desktop Widgtes updates.. Harry Bomrah 2012-11-05 23:04:54 +08:00
• 3c85f3ef00 Make the archive module work (it needs more details) chris 2012-11-01 11:45:26 +08:00
• f68fe22cba Desktop Widgtes updates.. Harry Bomrah 2012-11-05 23:04:54 +08:00
• 73fd9d1f97 Merge branch 'modified_show_plugin_profile' of github.com:Rulingcom/orbit into modified_show_plugin_profile chris 2012-11-05 11:43:00 +08:00
• c314745545 add link of title Rueshyna 2012-11-05 10:37:04 +08:00
• e4de1e34a2 add announcement plugin Rueshyna 2012-11-04 22:05:03 +08:00
• 9433d59c04 relpace tab with sapce Rueshyna 2012-11-04 22:04:13 +08:00
• ed3644fb89 done journal Rueshyna 2012-11-02 16:31:41 +08:00
• a5e2c3e0ce Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-05 11:41:48 +08:00
• ca3e06c58b update for desktop widgets Harry Bomrah 2012-11-01 20:42:40 +08:00
• 2e809c5c19 Calander view updated... Harry Bomrah 2012-11-01 10:45:22 +08:00
• 228d43d0e2 calendar update devin 2012-10-30 17:26:52 +08:00
• 6dd9f441ef Agenda View Harry Bomrah 2012-10-29 19:52:34 +08:00
• d070c70512 calendar agenda view update devin 2012-10-27 00:11:26 +08:00
• 513671e498 lot of updates Harry Bomrah 2012-10-26 19:04:51 +08:00
• 58d4554b0b Fixing bugs chris 2012-11-05 11:30:15 +08:00
• 9f3c3f0d7e add link of title Rueshyna 2012-11-05 10:37:04 +08:00
• 3d5274a6f9 add announcement plugin Rueshyna 2012-11-04 22:05:03 +08:00
• 0e1f3d81d1 relpace tab with sapce Rueshyna 2012-11-04 22:04:13 +08:00
• 6783844937 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-04 20:43:23 +08:00
• beb843f75b add new member with role interface. add more not usable. role management new attribute is ok. delete is ok. Matthew K. Fu JuYuan 2012-11-04 05:56:29 +08:00
• fe0e49c3e9 Remove a folder in wich Chinese characters chris 2012-11-04 20:32:54 +08:00
• be08682c6b Merge branch 'new' of github.com:Rulingcom/orbit into new chris 2012-11-04 20:25:05 +08:00
• bd17641d18 member plugin list add new unknown 2012-11-02 18:28:23 +08:00
• e47465d4b7 add new member with role interface. add more not usable. role management new attribute is ok. delete is ok. Matthew K. Fu JuYuan 2012-11-04 05:56:29 +08:00
• 2f61b3e0c9 member plugin list add new unknown 2012-11-02 18:28:23 +08:00
• f61a81ab56 done journal Rueshyna 2012-11-02 16:31:41 +08:00
• 28337c6b5b update for desktop widgets Harry Bomrah 2012-11-01 20:42:40 +08:00
• 9bf812b8d9 calendar "edit calendar" update devin 2012-11-01 15:21:42 +08:00
• d904163090 Merge branch 'gallery_orbit' into desktop_devin Harry Bomrah 2012-11-01 10:47:23 +08:00
• a25199d33b Calander view updated... Harry Bomrah 2012-11-01 10:45:22 +08:00
• 451d73897b Fix bugs: Page content: after edit and redirect to index, there's a gap between the headers and the first row TinyMCE: the size of the textarea change depending on the language chris 2012-11-01 09:30:12 +08:00
• 167c993108 calendar update devin 2012-10-30 17:26:52 +08:00
• bc9082a858 Fix bug: Fix the bug due to not finding the ModuleApp chris 2012-10-30 17:10:59 +08:00
• 63a57682e6 Fix bugs: TinyMCE: the size of the textarea change depending on the language Page content edit: no tab selected on first load chris 2012-10-30 17:09:00 +08:00
• cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned chris 2012-10-30 11:08:26 +08:00
• 664c6d2f61 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Matthew K. Fu JuYuan 2012-10-30 10:11:51 +08:00
• ff9b9af7df Remove useless files,add test files and Guardfile Matthew K. Fu JuYuan 2012-10-30 10:00:27 +08:00
• 5da35ee65b Agenda View Harry Bomrah 2012-10-29 19:52:34 +08:00
• 65ac6980c4 Merge branch 'various_bugs' into nccu_master chris 2012-10-29 16:10:07 +08:00
• b73981b19a Devin commit Harry Bomrah 2012-10-29 10:17:49 +08:00
• 12b7618cc7 calendar agenda view update devin 2012-10-27 00:11:26 +08:00
• 5e25cf5849 lot of updates Harry Bomrah 2012-10-26 19:04:51 +08:00
• 9b5f4e4775 Fix bug: User cannot connect using the orbit button (Devise configuration) chris 2012-10-26 17:42:14 +08:00
• 2c5539eda9 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-26 11:28:00 +08:00
• bd0d975014 for user new interface, member role is working. Matthew K. Fu JuYuan 2012-10-24 14:46:25 +08:00
• b301f6522a Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update chris 2012-10-26 11:20:26 +08:00
• d7fd61ce55 Edit uploaded package chris 2012-10-24 18:40:38 +08:00
• 0a1a9d2c2e member for THU Matthew K. Fu JuYuan 2012-10-18 18:36:21 +08:00
• 579c7b5e81 Add missing helper chris 2012-10-16 16:20:22 +08:00
• 68bc4c1874 Fix page_part creation when design is changed chris 2012-10-16 14:17:12 +08:00
• cbfa659928 Changes for side_bar chris 2012-10-15 15:30:48 +08:00
• c305a2f687 add i18n variables Matthew K. Fu JuYuan 2012-10-15 15:15:19 +08:00
• f4f07c7206 fix sub role attribute fields run: Role.any_in(:key=>['department_admin','administrator']).destroy_all for deleting old role data to complete this code. Matthew K. Fu JuYuan 2012-10-15 14:44:48 +08:00
• 9c16da4f46 fixed html for add link. form html Matthew K. Fu JuYuan 2012-10-15 14:07:53 +08:00
• 03b608593d can add member Matthew K. Fu JuYuan 2012-10-15 13:54:29 +08:00
• 0a56c555bb new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +08:00
• 8b9cffd4f2 new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +08:00
• 293dc80ceb Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin chris 2012-10-26 11:15:51 +08:00
• a5722af315 Calendar updates for day view Harry Bomrah 2012-10-24 18:55:06 +08:00
• 8c6e5deb64 gallery update devin 2012-10-24 09:47:09 +08:00
• 79e0b8e383 week view updates Harry Bomrah 2012-10-18 22:21:13 +08:00
• 98ef582e17 shit calendar update devin 2012-10-17 17:35:30 +08:00
• c29955d9e3 external commit Harry Bomrah 2012-10-16 21:52:10 +08:00
• d7e8663c1d calendar updated for week Harry Bomrah 2012-10-16 21:50:46 +08:00
• 6b8255f8f8 Remove a folder in wich Chinese characters chris 2012-10-26 11:14:13 +08:00
• 974849b85a Merge branch 'gallery_orbit' into desktop_devin Harry Bomrah 2012-10-24 19:11:12 +08:00
• f4eb95881f Calendar updates for day view Harry Bomrah 2012-10-24 18:55:06 +08:00
• 2b2dd53218 Edit uploaded package chris 2012-10-24 18:40:38 +08:00
• 1b876d4305 for user new interface, member role is working. Matthew K. Fu JuYuan 2012-10-24 14:46:25 +08:00
• 8c63be5c33 gallery update devin 2012-10-24 09:47:09 +08:00
• a810312da4 week view updates Harry Bomrah 2012-10-18 22:21:13 +08:00
• 9110c3e716 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site Christophe Vilayphiou 2012-10-18 18:51:14 +08:00
• 976114cfa9 Add missing helper chris 2012-10-16 16:20:22 +08:00
• d1797ac8e3 Fix page_part creation when design is changed chris 2012-10-16 14:17:12 +08:00
• 13ae2602cd member for THU Matthew K. Fu JuYuan 2012-10-18 18:36:21 +08:00
• 47df69f8cf shit calendar update devin 2012-10-17 17:35:30 +08:00
• 6113b9c46c external commit Harry Bomrah 2012-10-16 21:52:10 +08:00
• 0971e00511 calendar updated for week Harry Bomrah 2012-10-16 21:50:46 +08:00
• 0d19cd6f10 Add missing helper chris 2012-10-16 16:20:22 +08:00
• 38e6d6c2c8 add rake task Matthew K. Fu JuYuan 2012-10-16 15:43:31 +08:00
• a50ccdafb2 consolidate_object_auth for 171 production Matthew K. Fu JuYuan 2012-10-16 15:08:02 +08:00
• b3a9a7ab07 Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-10-16 14:24:01 +08:00
• 6dfe10040b fix object auth without app_auth Matthew K. Fu JuYuan 2012-10-16 14:23:44 +08:00
• cc6c8dab2a Fix page_part creation when design is changed chris 2012-10-16 14:17:12 +08:00