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

• 1c6badfb10 add more fake data Rueshyna 2012-11-16 09:13:51 +08:00
• b6004958c9 make it real Rueshyna 2012-11-16 01:54:10 +08:00
• bf4c75fcdc add new function Rueshyna 2012-11-16 01:53:45 +08:00
• fd3fa19573 add fake data, execute by rake db:seed Rueshyna 2012-11-16 01:53:17 +08:00
• f93d019ba0 check file type Rueshyna 2012-11-15 22:39:01 +08:00
• 61c0c4b542 modified file of view bug Rueshyna 2012-11-15 11:18:55 +08:00
• 97ffb5ff18 file view update Harry Bomrah 2012-11-14 21:12:10 +08:00
• 02643c12bf modified getjournals format Rueshyna 2012-11-14 17:27:36 +08:00
• 5643b0a528 delete demo db of journal and paper Rueshyna 2012-11-13 17:22:25 +08:00
• 4ce10d2fd9 make a json format for view of journal_p Rueshyna 2012-11-13 17:21:23 +08:00
• 048e8dd7ab Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-21 07:37:20 +08:00
• f2e76d27b8 minor update for gallery and calendar backend devin 2012-11-20 18:04:23 +08:00
• 95fc5676bf add co-author db and curd page, but it can't destory it... Rueshyna 2012-11-21 01:56:30 +08:00
• ccfecb8243 add co-author page and new it, but can't destory it... Rueshyna 2012-11-21 01:54:06 +08:00
• 96fe482d50 for openness Matthew K. Fu JuYuan 2012-11-20 20:20:59 +08:00
• 1c0fd0e199 minor update for gallery and calendar backend devin 2012-11-20 18:04:23 +08:00
• be850ce0be minor update for gallery and calendar backend devin 2012-11-20 18:04:23 +08:00
• 0ef76f9200 Desktop updates various Harry Bomrah 2012-11-20 17:20:05 +08:00
• c6894be962 first version of confined sidebar render Matthew K. Fu JuYuan 2012-11-20 15:56:52 +08:00
• 6273300c28 Fix for ad_image chris 2012-11-20 15:47:07 +08:00
• 95a3831dce done add journals function Rueshyna 2012-11-20 14:58:15 +08:00
• 7416020161 Add force_order_for_user for ad_images chris 2012-11-20 14:24:49 +08:00
• c8bbb28d42 Fix wrong alias in design.rb for themes chris 2012-11-20 12:46:50 +08:00
• 84c284fa71 Fix wrong naming in theme.rb chris 2012-11-20 12:42:53 +08:00
• dcd781b36b Restore "force_order_for_user" for ad_banner chris 2012-11-20 12:38:35 +08:00
• df58d4c5f3 Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format chris 2012-11-20 12:14:53 +08:00
• bb63e68ee7 rm redundant file ... Rueshyna 2012-11-15 12:14:34 +08:00
• 47075944e7 make gallery json format to two layer Rueshyna 2012-11-15 12:11:58 +08:00
• 81f67fc08a make announcement json format to two layer Rueshyna 2012-11-15 11:49:00 +08:00
• bfef1a8e7c tmp Rueshyna 2012-11-15 11:06:33 +08:00
• bd7518093f about route url link bug Rueshyna 2012-11-14 16:20:32 +08:00
• 310d7523bd modified gallery json format but it have some bugs... Rueshyna 2012-11-14 12:01:42 +08:00
• 36b4cb1ec1 modified announcement json format but it have some bugs... Rueshyna 2012-11-14 12:01:18 +08:00
• c1da80761e Remove wrong mongo port chris 2012-11-20 12:04:34 +08:00
• 3beed406a7 Fix Nokogiri when '.first' returns nothing chris 2012-11-20 12:00:18 +08:00
• 747b0d4620 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-20 10:11:59 +08:00
• 1a76d5d3cb Merge branch 'new' of github.com:Rulingcom/orbit into new chris 2012-11-20 10:10:16 +08:00
• 192e52b5de Remove middle site chris 2012-11-20 10:06:07 +08:00
• 609c932cca Fix some gallery routes chris 2012-11-20 10:05:56 +08:00
• d61621e198 Remove some pry and add address code chris 2012-11-20 10:05:38 +08:00
• 6789d44431 Fix design edit chris 2012-11-20 10:04:50 +08:00
• 05081c1a5c Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-20 09:56:28 +08:00
• 2aa9a19deb complete address field. still have javascript issue for fill back and display address ext fields in modal. Matthew K. Fu JuYuan 2012-11-16 15:36:08 +08:00
• 17988f2fb2 address field and text field convert Matthew K. Fu JuYuan 2012-11-15 17:23:39 +08:00
• a85e5fcc0d address field. js and style is broken Matthew K. Fu JuYuan 2012-11-12 10:41:41 +08:00
• be448d42c9 add_more ok Matthew K. Fu JuYuan 2012-11-08 18:59:19 +08:00
• 04469ff845 Minor update for gallery frontend Harry Bomrah 2012-11-19 18:18:46 +08:00
• 398432d0fc some bugs Rueshyna 2012-11-19 16:28:05 +08:00
• db3797694b change journal list json link Rueshyna 2012-11-19 12:13:05 +08:00
• 8abb20b4c8 add edit function Rueshyna 2012-11-19 12:07:24 +08:00
• 9501bf2df3 midify checkbox value Rueshyna 2012-11-18 14:15:00 +08:00
• 26436395f5 finished some method of list and journal Rueshyna 2012-11-18 03:07:50 +08:00
• 024b331cf3 split form from add.html.erb Rueshyna 2012-11-16 16:02:17 +08:00
• b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Matthew K. Fu JuYuan 2012-11-16 15:42:39 +08:00
• 3034e53423 complete address field. still have javascript issue for fill back and display address ext fields in modal. Matthew K. Fu JuYuan 2012-11-16 15:36:08 +08:00
• e60480a4be add.html convert to add.html.erb done Rueshyna 2012-11-16 15:33:31 +08:00
• b51397d2e2 convert html template to html.erb Rueshyna 2012-11-16 12:54:21 +08:00
• c85b15e425 rm binding.pre ... Rueshyna 2012-11-16 09:44:57 +08:00
• 34f0eea1ff add more fake data Rueshyna 2012-11-16 09:13:51 +08:00
• b998b8f346 make it real Rueshyna 2012-11-16 01:54:10 +08:00
• bf5a48ef4c add new function Rueshyna 2012-11-16 01:53:45 +08:00
• 27ed7c74dd add fake data, execute by rake db:seed Rueshyna 2012-11-16 01:53:17 +08:00
• 3144b84d10 check file type Rueshyna 2012-11-15 22:39:01 +08:00
• 69bf552fa7 Fix: remove i18n_variable from reload_frontend_pages.js.erb chris 2012-11-15 18:11:01 +08:00
• fb74d74c72 Fix: - page_part not including items_helper - categories for bulletins front-end chris 2012-11-15 18:01:49 +08:00
• 995bdbc86c address field and text field convert Matthew K. Fu JuYuan 2012-11-15 17:23:39 +08:00
• 112f7000a0 Fix announcement front-end bug chris 2012-11-15 17:23:24 +08:00
• 9b1ada0af9 Fix these bugs: chris 2012-11-15 15:51:44 +08:00
• e7b675c91e rm redundant file ... Rueshyna 2012-11-15 12:14:34 +08:00
• 4a7b5a1bf6 make gallery json format to two layer Rueshyna 2012-11-15 12:11:58 +08:00
• 97c2366221 make announcement json format to two layer Rueshyna 2012-11-15 11:49:00 +08:00
• c627376fbe modified file of view bug Rueshyna 2012-11-15 11:18:55 +08:00
• ba4bc67e0e tmp Rueshyna 2012-11-15 11:06:33 +08:00
• e9f3b45ce8 Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP Rueshyna 2012-11-15 10:05:21 +08:00
• 351767cd98 file view update Harry Bomrah 2012-11-14 21:12:10 +08:00
• 529e2110d7 modified getjournals format Rueshyna 2012-11-14 17:27:36 +08:00
• 46f80ade6a Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit Harry Bomrah 2012-11-14 16:25:02 +08:00
• 4b3911e866 about route url link bug Rueshyna 2012-11-14 16:20:32 +08:00
• d7d1b9e31b widget update Harry Bomrah 2012-11-14 15:28:55 +08:00
• 3ce2d58f57 Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2012-11-14 12:03:00 +08:00
• 96622b168f modified gallery json format but it have some bugs... Rueshyna 2012-11-14 12:01:42 +08:00
• ad429af58c modified announcement json format but it have some bugs... Rueshyna 2012-11-14 12:01:18 +08:00
• 11b602a1bf delete demo db of journal and paper Rueshyna 2012-11-13 17:22:25 +08:00
• bfdd155c1e make a json format for view of journal_p Rueshyna 2012-11-13 17:21:23 +08:00
• 9095713769 Fix bugs in Json when missing files chris 2012-11-13 15:21:59 +08:00
• 1ecb8a0c8b Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2012-11-12 15:24:24 +08:00
• e8bd06307d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-12 15:11:54 +08:00
• e498be9753 desktopAPI update. Harry Bomrah 2012-11-08 19:42:22 +08:00
• a56d80698f desktop api update.. Harry Bomrah 2012-11-08 17:01:59 +08:00
• e5d31f50a0 calendar "edit calendar" update devin 2012-11-01 15:21:42 +08:00
• 39612b879c address field. js and style is broken Matthew K. Fu JuYuan 2012-11-12 10:41:41 +08:00
• 295aef32ab change host with host_with_port Rueshyna 2012-11-09 16:31:36 +08:00
• 275c6f4c8a get_album_json function can get readable json Rueshyna 2012-11-09 16:25:11 +08:00
• e4de229b22 make json readable Rueshyna 2012-11-09 16:24:37 +08:00
• 624d12de6d make json readable Rueshyna 2012-11-09 16:24:23 +08:00
• 80abfc80bf fixed get_bulletins_json of gprs bug Rueshyna 2012-11-09 10:41:49 +08:00
• 5fb32f3867 desktopAPI update. Harry Bomrah 2012-11-08 19:42:22 +08:00
• dafe28ffb5 add_more ok Matthew K. Fu JuYuan 2012-11-08 18:59:19 +08:00
• b1d808cb86 Merge branch 'gallery_orbit' into desktop_devin Harry Bomrah 2012-11-08 17:05:49 +08:00
• e45502cd68 desktop api update.. Harry Bomrah 2012-11-08 17:01:59 +08:00