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

• 254a81fa5d add templete Rueshyna 2012-11-28 18:12:21 +08:00
• 2f67a96532 url fixed and edit form fixed for tinyscrollbar Harry Bomrah 2012-11-28 18:11:49 +08:00
• 796dcc4dc6 easy to make fake data Rueshyna 2012-11-28 15:20:02 +08:00
• 25324809bb add account link Rueshyna 2012-11-28 14:42:15 +08:00
• 730c29bf49 change layout Rueshyna 2012-11-28 14:28:41 +08:00
• 114ca5493a replace rss format with json in announcement Rueshyna 2012-11-28 13:43:48 +08:00
• 2f05885c4a add journal list template Rueshyna 2012-11-28 11:45:23 +08:00
• 452b1525de Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication Rueshyna 2012-11-27 15:57:18 +08:00
• 9cc518b456 autocomplete done Harry Bomrah 2012-11-27 15:55:32 +08:00
• 46576c6947 modify fake data Rueshyna 2012-11-27 00:18:34 +08:00
• 6de62318c5 fake data for journal and coauthor Rueshyna 2012-11-27 00:05:04 +08:00
• 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config Matthew K. Fu JuYuan 2012-11-26 17:55:53 +08:00
• c9e3d5271a remove '"' candidate list Rueshyna 2012-11-26 16:06:22 +08:00
• 0125010a05 modified error msgs and cancle button, but those two have bug... Rueshyna 2012-11-26 15:45:51 +08:00
• 613bbec1f0 Merge branch 'autocomplete' into publication Rueshyna 2012-11-26 14:44:52 +08:00
• 065d38c797 add autocomplete js Rueshyna 2012-11-26 14:44:35 +08:00
• f2d1b0eaf7 Merge branch 'fake_journal_data' into publication Rueshyna 2012-11-26 14:05:50 +08:00
• 5e04ec70a3 make a 'real' fake data Rueshyna 2012-11-26 11:52:11 +08:00
• 10c1b3e6a2 Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2012-11-26 11:36:13 +08:00
• 6b248a949b Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin chris 2012-11-26 10:25:57 +08:00
• 8a79d7ff2e member selects unknown 2012-11-26 10:14:43 +08:00
• 4e7ff62c2b Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-26 10:24:15 +08:00
• 9061448c5f add paper status textfield Rueshyna 2012-11-26 09:37:24 +08:00
• 23de4f72a6 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-26 10:22:52 +08:00
• 9a684f54b4 fix for showing subroles Matthew K. Fu JuYuan 2012-11-26 10:08:06 +08:00
• 1f0287dd7e member selects unknown 2012-11-26 10:14:43 +08:00
• 046dbc9524 fix for showing subroles Matthew K. Fu JuYuan 2012-11-26 10:08:06 +08:00
• 6d861f8be0 add paper status textfield Rueshyna 2012-11-26 09:37:24 +08:00
• 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-26 05:02:58 +08:00
• 274d4b5cff Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-23 13:22:46 +08:00
• 3933c048b0 delete fixed Harry Bomrah 2012-11-23 13:22:01 +08:00
• 8009c6aa34 fixed delete function Rueshyna 2012-11-23 12:28:36 +08:00
• e06495d4ad Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-23 10:50:10 +08:00
• f38f32ac8b delete update Harry Bomrah 2012-11-23 10:46:42 +08:00
• 996a69f595 add co-author json Rueshyna 2012-11-23 10:44:48 +08:00
• cad03a70d5 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-22 21:11:57 +08:00
• 5b39d10ac6 user roles starts Matthew K. Fu JuYuan 2012-11-22 18:20:11 +08:00
• 77386f0284 disable data transform when switching attribute field type. new member stable Matthew K. Fu JuYuan 2012-11-22 17:49:44 +08:00
• edf38644c9 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-22 21:06:41 +08:00
• f6d3b4a9e9 correct 'edit' button of journal list Rueshyna 2012-11-22 18:15:07 +08:00
• 43f6b7b271 make fake data Rueshyna 2012-11-22 16:34:20 +08:00
• 868d1c2201 fix for json and some other bugs Harry Bomrah 2012-11-22 16:31:37 +08:00
• e29583ed1f add delete link Rueshyna 2012-11-22 15:21:43 +08:00
• 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... Rueshyna 2012-11-22 10:49:54 +08:00
• c281ae9447 hidden file field, and fixed updated function Rueshyna 2012-11-22 02:37:56 +08:00
• 6a12aec67c Fix album images display chris 2012-11-22 20:01:10 +08:00
• cc7907f37a user roles starts Matthew K. Fu JuYuan 2012-11-22 18:20:11 +08:00
• 9189ebffee correct 'edit' button of journal list Rueshyna 2012-11-22 18:15:07 +08:00
• 6dff83339a disable data transform when switching attribute field type. new member stable Matthew K. Fu JuYuan 2012-11-22 17:49:44 +08:00
• 773cd2b190 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-22 16:34:29 +08:00
• 645f25d446 make fake data Rueshyna 2012-11-22 16:34:20 +08:00
• 90fd9de5a8 fix for json and some other bugs Harry Bomrah 2012-11-22 16:31:37 +08:00
• e453cfce9c add delete link Rueshyna 2012-11-22 15:21:43 +08:00
• c0ac69fc84 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-22 10:51:30 +08:00
• 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... Rueshyna 2012-11-22 10:49:54 +08:00
• 39adbb35c1 Remove before_filter for sub_manager in users chris 2012-11-22 09:37:31 +08:00
• 475642d375 Remove news and fix default_url in ImageUploader chris 2012-11-22 09:30:25 +08:00
• bb69a059e8 hidden file field, and fixed updated function Rueshyna 2012-11-22 02:37:56 +08:00
• 0d26f48c9a Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin chris 2012-11-21 19:03:10 +08:00
• 25a9987f13 calendar js minor update devin 2012-11-21 11:16:23 +08:00
• f8692280e5 Merge branch 'openness' of github.com:Rulingcom/orbit into openness chris 2012-11-21 18:59:53 +08:00
• 1dc44e34ac Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness Matthew K. Fu JuYuan 2012-11-21 18:45:46 +08:00
• 2d0e8b37b2 Fix: - Widgets for announcement - Facebook link - AdBanner nav chris 2012-11-21 18:42:14 +08:00
• bfa6579aad Merge branch 'openness' of github.com:Rulingcom/orbit into openness chris 2012-11-21 18:39:50 +08:00
• ec0ec46303 visitor now can browse gallery Matthew K. Fu JuYuan 2012-11-21 18:34:15 +08:00
• 6ca52226ba Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-21 18:38:28 +08:00
• 73e76f2477 routes fixed Harry Bomrah 2012-11-21 17:39:01 +08:00
• c53581c999 small fix for journal_pages desktop Harry Bomrah 2012-11-21 17:11:18 +08:00
• 0b9af044ba new file created for journal pages Harry Bomrah 2012-11-21 15:35:23 +08:00
• b47be52309 tmp Rueshyna 2012-11-21 14:52:26 +08:00
• d502f561ef add co-author db and curd page, but it can't destory it... Rueshyna 2012-11-21 01:56:30 +08:00
• 6a9426c9c8 add co-author page and new it, but can't destory it... Rueshyna 2012-11-21 01:54:06 +08:00
• f9b5f71930 visitor now can browse gallery Matthew K. Fu JuYuan 2012-11-21 18:34:15 +08:00
• 5006cd2f61 done add journals function Rueshyna 2012-11-20 14:58:15 +08:00
• 0aaadbc82d Merge branch 'openness' of github.com:Rulingcom/orbit into openness chris 2012-11-21 18:33:04 +08:00
• 1279af0c11 fix and hide for visitors,except for album Matthew K. Fu JuYuan 2012-11-21 11:46:06 +08:00
• 1f8f58e930 album and gallery is now opened Matthew K. Fu JuYuan 2012-11-21 17:52:25 +08:00
• 262df57298 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-21 17:48:03 +08:00
• 91005bb00a routes fixed Harry Bomrah 2012-11-21 17:39:01 +08:00
• 24bb56416e Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-21 17:12:22 +08:00
• c94940214c small fix for journal_pages desktop Harry Bomrah 2012-11-21 17:11:18 +08:00
• ef3fddd863 fixed sutpid bug for calendar Harry Bomrah 2012-11-21 16:55:18 +08:00
• b4e058e557 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-21 15:36:35 +08:00
• b571373c8f new file created for journal pages Harry Bomrah 2012-11-21 15:35:23 +08:00
• 9fc8ec8e16 back button fix for frontend Harry Bomrah 2012-11-21 15:00:07 +08:00
• 5c0b137c6d tmp Rueshyna 2012-11-21 14:52:26 +08:00
• fda7c43efc Merge branch 'master' of github.com:Rulingcom/orbit into openness Matthew K. Fu JuYuan 2012-11-21 11:46:44 +08:00
• ee053cd8ac fix and hide for visitors,except for album Matthew K. Fu JuYuan 2012-11-21 11:46:06 +08:00
• 2cc1ed1db7 calendar js minor update devin 2012-11-21 11:16:23 +08:00
• da1b871481 merge Rueshyna 2012-11-21 10:46:33 +08:00
• 4966537491 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP chris 2012-11-21 07:38:10 +08:00
• 8f65284932 Desktop updates various Harry Bomrah 2012-11-20 17:20:05 +08:00
• b359d5d566 some bugs Rueshyna 2012-11-19 16:28:05 +08:00
• 703324063e change journal list json link Rueshyna 2012-11-19 12:13:05 +08:00
• d7599f1ccf add edit function Rueshyna 2012-11-19 12:07:24 +08:00
• a3edebce6a midify checkbox value Rueshyna 2012-11-18 14:15:00 +08:00
• 5eb8cc4063 finished some method of list and journal Rueshyna 2012-11-18 03:07:50 +08:00
• 7e9b60a527 split form from add.html.erb Rueshyna 2012-11-16 16:02:17 +08:00
• fe373fad92 add.html convert to add.html.erb done Rueshyna 2012-11-16 15:33:31 +08:00
• ae10a2b8a2 convert html template to html.erb Rueshyna 2012-11-16 12:54:21 +08:00