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

• 4f7928ad1b Merge branch 'development' of github.com:Rulingcom/orbit into development Fu Matthew 2013-03-06 15:17:06 +08:00
• 77c7053bf1 put add admin pages using orbit back end controller Fu Matthew 2013-03-06 15:16:20 +08:00
• 20ac4f1ac0 all none for conf done harrybomrah 2013-03-06 12:08:08 +08:00
• 9931eb7f61 all none fixed harrybomrah 2013-03-06 11:32:53 +08:00
• 27686a5d04 Merge branch 'development' into desktop chris 2013-03-05 19:07:58 +08:00
• a9bf400fac Merge branch 'desktop_work_devin' into desktop Rueshyna 2013-03-05 18:48:12 +08:00
• 74900ac048 Merge branch 'desktop_work' into desktop_work_devin Rueshyna 2013-03-05 18:35:17 +08:00
• dc3966be81 fix cates and tags Fu Matthew 2013-03-05 18:34:41 +08:00
• f2f8ffd157 tinyscrollbar minor update devin 2013-03-05 17:22:53 +08:00
• 924ecc3b1f desktop CSS update devin 2013-03-05 09:39:01 +08:00
• d5f1d13670 Merge remote-tracking branch 'origin/desktop_work' into desktop Rueshyna 2013-03-05 17:34:28 +08:00
• 806ffe0a1e fixed desktop several bug Rueshyna 2013-03-05 17:31:57 +08:00
• db2b371744 tinyscrollbar minor update devin 2013-03-05 17:22:53 +08:00
• f6272728d5 fixed delete co author relation bug Rueshyna 2013-03-05 12:41:42 +08:00
• 430981a534 checked back and cancel button of personal plugin and fixed journal co author save and update bug Rueshyna 2013-03-05 12:14:10 +08:00
• 626b2a7bca fix default failed when cate or tags set to empty Fu Matthew 2013-03-05 11:48:20 +08:00
• 3182f5c9a8 merging harrybomrah 2013-03-05 11:20:01 +08:00
• dc92ef9f42 simple layout tinyscrollbar fixed harrybomrah 2013-03-05 11:04:04 +08:00
• 4e24223c78 desktop CSS update devin 2013-03-05 09:39:01 +08:00
• 285119a5f3 fix for multi select cates and tags Fu Matthew 2013-03-04 19:29:45 +08:00
• 80b6a9ab48 Merge branch 'desktop' into desktop_work Rueshyna 2013-03-04 18:03:59 +08:00
• b5abbc9ef0 highlighting fixed… harrybomrah 2013-03-04 17:44:55 +08:00
• ee5fd18b64 highlighting fixed… harrybomrah 2013-03-04 17:44:55 +08:00
• 874648eacf add Devin's css file for gallery Rueshyna 2013-03-04 17:27:36 +08:00
• a6ca308a5e using refine tiny scroll bar js for personal plugin Rueshyna 2013-03-04 16:35:09 +08:00
• 8ade2c5949 fixed adding. harrybomrah 2013-03-04 16:21:35 +08:00
• 0c659e5a9b layout fix harrybomrah 2013-03-04 14:57:36 +08:00
• d4392c8d56 fixed adding. harrybomrah 2013-03-04 16:21:35 +08:00
• 6ae4e4d0ef layout fix harrybomrah 2013-03-04 14:57:36 +08:00
• 9a32732ae4 layout fix harrybomrah 2013-03-04 14:57:36 +08:00
• 15b9839b76 fix archive category fix page adding failed Fu Matthew 2013-03-04 14:40:29 +08:00
• e69679d3fe tinyscrollbar_bug fixed harrybomrah 2013-03-01 17:49:58 +08:00
• 2ead541733 url handling modified.. tinyscrollbar modified… star checkbox fixed.. harrybomrah 2013-03-01 14:45:20 +08:00
• 23c8c28b52 tinyscrollbar fixed harrybomrah 2013-02-27 18:55:26 +08:00
• 0f12314213 some changes for gridster harrybomrah 2013-02-27 11:47:41 +08:00
• b8ee748723 Lot of changes in gridster harrybomrah 2013-02-26 11:47:05 +08:00
• ee4b94ace0 Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop Rueshyna 2013-03-04 12:17:14 +08:00
• 8f1d7b55ab authors auto-complete Rueshyna 2013-03-04 12:16:46 +08:00
• e99fef9404 fixed paper title and journal title bug Rueshyna 2013-03-04 11:45:39 +08:00
• c1cb5e5ffb tinyscrollbar_bug fixed harrybomrah 2013-03-01 17:49:58 +08:00
• 9b8ab2a2c1 url handling modified.. tinyscrollbar modified… star checkbox fixed.. harrybomrah 2013-03-01 14:45:20 +08:00
• c82e9a646d tinyscrollbar fixed harrybomrah 2013-02-27 18:55:26 +08:00
• 7ef02d3108 Merge branch 'desktop' into desktop_work harrybomrah 2013-02-27 11:51:56 +08:00
• 912080482b some changes for gridster harrybomrah 2013-02-27 11:47:41 +08:00
• ca946fc881 Merge branch 'development' of github.com:Rulingcom/orbit into development chris 2013-02-27 11:03:52 +08:00
• 0dabd5b95f fix widget field reload Fu Matthew 2013-02-25 12:49:06 +08:00
• 071e8a349c link to more Fu Matthew 2013-02-23 18:29:50 +08:00
• 8a8bfcb8fb fix default widget link Fu Matthew 2013-02-23 15:19:51 +08:00
• d7699e1a46 fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init Fu Matthew 2013-02-23 15:19:04 +08:00
• 0e6599e9b9 fix javascript disable checkbox failed after cate and tags being reloaded. Fu Matthew 2013-02-23 11:34:47 +08:00
• 99e67c8719 first version of multi categories and tags Fu Matthew 2013-02-06 19:51:53 +08:00
• 4bc3a57862 give back and cancel button a link for personal conference Rueshyna 2013-02-26 18:37:58 +08:00
• f431ab9ab5 give back and cancel button a link for personal journal Rueshyna 2013-02-26 18:37:33 +08:00
• fb931b0a4a Merge remote-tracking branch 'origin/desktop' into desktop Rueshyna 2013-02-26 17:02:01 +08:00
• 6c9e2a7249 fixed journal co author bug Rueshyna 2013-02-26 16:57:08 +08:00
• d0b54a4d6c done conferece seeds Rueshyna 2013-02-26 15:52:42 +08:00
• 81725ed942 split db/seeds.rb file to local plugin and done journal Rueshyna 2013-02-26 15:52:20 +08:00
• c55f64f3c6 correct view permission of conference Rueshyna 2013-02-26 15:17:09 +08:00
• 4ac0f19011 generate journal page by rails side and fixed model name bug Rueshyna 2013-02-26 15:15:09 +08:00
• e9c0f443b7 Lot of changes in gridster harrybomrah 2013-02-26 11:47:05 +08:00
• 5f832a17d4 fix widget field reload Fu Matthew 2013-02-25 12:49:06 +08:00
• dbf93ea9a8 Remove Gemfile.lock chris 2013-02-25 12:06:23 +08:00
• fbf3f9fd2f Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop chris 2013-02-25 12:02:10 +08:00
• 6f599bb95d sort conference and type Rueshyna 2013-02-25 11:43:02 +08:00
• 522e0481e1 add conferene list order function Rueshyna 2013-02-25 11:38:11 +08:00
• 1f58ed5cda Merge branch 'desktop_work' of github.com:Rulingcom/orbit into desktop_work chris 2013-02-25 12:01:37 +08:00
• 8b0ffe747c sort conference and type Rueshyna 2013-02-25 11:43:02 +08:00
• 6929d30b5d add conferene list order function Rueshyna 2013-02-25 11:38:11 +08:00
• edd2c1f522 css minor changes. harrybomrah 2013-02-23 17:12:02 +08:00
• 9f362d9ae6 gridster, url code fixed, views removed. harrybomrah 2013-02-23 15:23:24 +08:00
• 3572856486 Fix selection of sub_menu for widget (the value wasn't set) chris 2013-02-25 10:35:59 +08:00
• 0be1c45c81 link to more Fu Matthew 2013-02-23 18:29:50 +08:00
• 5b0b8e6c79 Fix bug in widget selection chris 2013-02-23 17:25:07 +08:00
• a0b22761c7 css minor changes. harrybomrah 2013-02-23 17:12:02 +08:00
• caac9191ce Fix public_r_tag selection chris 2013-02-23 16:52:37 +08:00
• 5f9dd984b1 gridster, url code fixed, views removed. harrybomrah 2013-02-23 15:23:24 +08:00
• 73bca03b33 fix default widget link Fu Matthew 2013-02-23 15:19:51 +08:00
• 8592015b1b fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init Fu Matthew 2013-02-23 15:19:04 +08:00
• ad9b91f792 Fix url with id in default widget chris 2013-02-23 12:20:45 +08:00
• d6dd38744b fix javascript disable checkbox failed after cate and tags being reloaded. Fu Matthew 2013-02-23 11:34:47 +08:00
• cd98f9c889 member plugin init add frontend spen 2013-02-22 18:21:11 +08:00
• 9fec7beb47 Merge branch 'development' of github.com:Rulingcom/orbit into development Fu Matthew 2013-02-22 17:53:49 +08:00
• b315215bed first version of multi categories and tags Fu Matthew 2013-02-06 19:51:53 +08:00
• 8704fb30d5 Fix init name/key chris 2013-02-22 14:46:22 +08:00
• 9a63adedde Remove seminar from conference init chris 2013-02-22 11:57:10 +08:00
• 680d7908b9 member plugin init edit chris 2013-02-21 17:53:08 +08:00
• 4709c08ad1 Temporary fix zh_tw.yml New Gemfile.lock chris 2013-02-19 20:42:46 +08:00
• d46abd7caf member list edit unknown 2013-02-20 11:12:08 +08:00
• 79f0fc1a3b add announcement header translation file Rueshyna 2013-02-20 22:39:15 +08:00
• 4ee85a8c09 add coauthor and coauthor relation function Rueshyna 2013-02-21 02:33:53 +08:00
• 13c757e8a9 clean add/edit page and add conference list page Rueshyna 2013-02-21 01:48:10 +08:00
• 16fda25ace done personal conference add/edit page Rueshyna 2013-02-20 16:02:54 +08:00
• 6d65af0312 done personal conference list page, but it need to js. Rueshyna 2013-02-20 13:43:30 +08:00
• 2afbae7c08 make a fake data for personal conference plugin Rueshyna 2013-02-07 18:33:06 +08:00
• 1c4b696052 add add/edit form page and controller Rueshyna 2013-02-05 18:53:58 +08:00
• 54b12a193a add translation configuration Rueshyna 2013-02-05 18:51:23 +08:00
• 158fd8ffff fixed conference icon and rename _p to _window of conference view Rueshyna 2013-02-05 18:49:27 +08:00
• f1db7be14e remove test and change for personal journal Rueshyna 2013-01-28 10:56:46 +08:00
• a61ec183c9 change add/edit url of personal_conference Rueshyna 2013-01-25 09:59:29 +08:00
• f59da3ce81 member plugin init edit unknown 2013-02-20 18:05:09 +08:00