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

• fbb53cca36 Ray's changes for sitemap backend OrbitServer 2012-08-08 11:51:20 +08:00
• 00e15d4814 Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share Christophe Vilayphiou 2012-08-08 11:04:38 +08:00
• 05e61b63bb Fix fb share, redirect with js when the page is not requested by fb but by user Christophe Vilayphiou 2012-08-08 10:12:21 +08:00
• a03d1ad10b Change for getting url from key Christophe Vilayphiou 2012-08-08 07:46:10 +08:00
• 6cfdf0f25a Change the way the orig_url is passed to fb Christophe Vilayphiou 2012-08-08 06:50:28 +08:00
• 4bed925e0f Try fb from override and generated page Christophe Vilayphiou 2012-08-08 05:40:50 +08:00
• acf4446523 Add meta to head for fb share Christophe Vilayphiou 2012-08-08 03:10:26 +08:00
• 85a556a4a2 first version of fb_share Matthew K. Fu JuYuan 2012-08-06 16:12:49 +08:00
• 2ed0f709c8 Merge branch 'master' of github.com:Rulingcom/NCCU Christophe Vilayphiou 2012-08-08 11:03:44 +08:00
• 06919e76ed fix approval at news and announcement for abnormal flags that causing search result fault. Matthew K. Fu JuYuan 2012-08-03 12:45:47 +08:00
• 1cdc0e24bd First version of Solr search. Matthew K. Fu JuYuan 2012-08-03 09:30:12 +08:00
• ef96ec841a Merge branch 'nccu_fix' of github.com:Rulingcom/NCCU into nccu_fix Christophe Vilayphiou 2012-08-08 10:53:52 +08:00
• c6c8187bda Changes for design: menu, frontend news and announcement Christophe Vilayphiou 2012-08-07 18:11:39 +08:00
• 9982fd880f Update the path when name is changed in item.rb Christophe Vilayphiou 2012-08-07 11:26:17 +08:00
• c8dcc9734d Change width for site map frontend, add link for more in announcement widget Christophe Vilayphiou 2012-08-06 18:41:29 +08:00
• 292105bdf1 Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie Christophe Vilayphiou 2012-08-06 17:34:00 +08:00
• 86a3d4a4b1 Remove console.log Christophe Vilayphiou 2012-08-06 15:15:44 +08:00
• ecc5c39840 Fix remote upload file for tinymce Christophe Vilayphiou 2012-08-06 15:13:21 +08:00
• cd4c9306da Revert useless changes Christophe Vilayphiou 2012-08-08 10:24:44 +08:00
• e9de0e24b4 Fix fb share, redirect with js when the page is not requested by fb but by user Christophe Vilayphiou 2012-08-08 10:12:21 +08:00
• db16fdc7b5 Change for getting url from key Christophe Vilayphiou 2012-08-08 07:46:10 +08:00
• f7e6703d5f Change the way the orig_url is passed to fb Christophe Vilayphiou 2012-08-08 06:50:28 +08:00
• fc560f4205 Try fb from override and generated page Christophe Vilayphiou 2012-08-08 05:40:50 +08:00
• 3cb182ff8e Add meta to head for fb share Christophe Vilayphiou 2012-08-08 03:10:26 +08:00
• 4660c26b7a fix for ie8,9 for tinymce Harry Bomrah 2012-08-07 20:55:18 +08:00
• fe4aadef29 Merge branch 'nccu_fix' of github.com:Rulingcom/NCCU into nccu_fix_matt Matthew K. Fu JuYuan 2012-08-07 19:22:16 +08:00
• cbf7ccc13b 1.Remove category column when category is specified 2.Showing category if not in category browsing 3.Redirect to home and show error if app page is not available for user language 4.Showing no context to display if object has no language for it. 5.Browse new and announcement by unit is now applicable. Matthew K. Fu JuYuan 2012-08-07 19:21:54 +08:00
• 8ea7bf75cd Fix uploader, ie9 ok, not ie8 Christophe Vilayphiou 2012-08-07 17:32:15 +08:00
• b5227c7b6c gallery update devin 2012-08-07 14:33:30 +08:00
• 0f5707394b encoding fixed devin 2012-08-06 22:11:36 +08:00
• 13f3d4db70 tp Harry Bomrah 2012-08-06 20:10:38 +08:00
• a08f85a3e2 Button fixes Harry Bomrah 2012-08-06 17:49:10 +08:00
• 3f543193f0 Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie Christophe Vilayphiou 2012-08-06 17:34:00 +08:00
• 5f0d6c9003 Code Merge Harry Bomrah 2012-08-06 17:05:12 +08:00
• 47408f4467 UI modifications Harry Bomrah 2012-08-06 17:01:53 +08:00
• 1c62c1a799 first version of fb_share Matthew K. Fu JuYuan 2012-08-06 16:12:49 +08:00
• 80887ace3c Remove console.log Christophe Vilayphiou 2012-08-06 15:15:44 +08:00
• 9a103bbb7e Fix remote upload file for tinymce Christophe Vilayphiou 2012-08-06 15:13:21 +08:00
• 9ebee5daea gallery update devin 2012-08-06 14:02:55 +08:00
• 337d690c54 gallery update devin 2012-08-06 11:07:58 +08:00
• 73b2cd1035 Fix typo and title in news and announcement frontend Christophe Vilayphiou 2012-08-05 15:04:52 +08:00
• 5f88408dcb Check for 'http' or 'https' before saving a link Christophe Vilayphiou 2012-08-04 16:29:31 +08:00
• 5fc679e0ca Toggle line color for announcement frontend Christophe Vilayphiou 2012-08-04 16:16:28 +08:00
• 6a94d4f550 Put back impressionist where it was commented out Christophe Vilayphiou 2012-08-04 15:42:53 +08:00
• 50b313976e Fix page: take category and tag at the same time Christophe Vilayphiou 2012-08-03 17:12:54 +08:00
• b79de66973 fix variable. Matthew K. Fu JuYuan 2012-08-03 14:42:18 +08:00
• c4e12ff347 Add missing class to ad_banner for link Christophe Vilayphiou 2012-08-03 13:55:22 +08:00
• a9141f91ba Merge branch 'sunspot_search' Matthew K. Fu JuYuan 2012-08-03 12:51:33 +08:00
• d7ad029d4b fix approval at news and announcement for abnormal flags that causing search result fault. Matthew K. Fu JuYuan 2012-08-03 12:45:47 +08:00
• 69901403cd First version of Solr search. Matthew K. Fu JuYuan 2012-08-03 09:30:12 +08:00
• 2d2e01115b Fix page: take category and tag at the same time With news and announcement views Christophe Vilayphiou 2012-08-03 01:44:06 +08:00
• 4127d7f2eb Fix tags Christophe Vilayphiou 2012-08-03 01:35:41 +08:00
• 6159c04da6 Merge branch 'gallery_orbit' into desktop_devin Harry Bomrah 2012-08-01 20:09:58 +08:00
• b0ef2b6957 Multi language and side bar update Harry Bomrah 2012-08-01 20:07:54 +08:00
• 1b29eb5de4 Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-08-01 18:15:28 +08:00
• ee5ac0227e change the algorithm of tag cloud. Matthew K. Fu JuYuan 2012-08-01 18:15:10 +08:00
• df9a1e8057 Fix typo Christophe Vilayphiou 2012-08-01 17:11:37 +08:00
• f917adcdf3 Fix typo Christophe Vilayphiou 2012-08-01 17:09:00 +08:00
• 0d048de33f Fix link in sitemap Christophe Vilayphiou 2012-08-01 17:08:07 +08:00
• 83acb78966 path instead of url Christophe Vilayphiou 2012-08-01 17:05:34 +08:00
• 410dfe62e8 Fix typo Christophe Vilayphiou 2012-08-01 17:03:39 +08:00
• 02ade108d0 Fix typo Christophe Vilayphiou 2012-08-01 16:59:11 +08:00
• d2564af001 Merge branch 'master' of github.com:Rulingcom/NCCU Christophe Vilayphiou 2012-08-01 16:38:35 +08:00
• 4df4274629 Add links to frontend_sitemap Christophe Vilayphiou 2012-08-01 16:38:07 +08:00
• eaa8171689 gallery update devin 2012-08-01 16:35:59 +08:00
• 25a911b4f8 Change for page: take category and tag at the same time Christophe Vilayphiou 2012-08-01 16:33:46 +08:00
• acebec8904 don't dislay web links if no eng. lists in widget is now sorted. Matthew K. Fu JuYuan 2012-08-01 15:24:55 +08:00
• 625801c0e9 Fix auth_users bug without category in news Christophe Vilayphiou 2012-08-01 03:07:23 +08:00
• f092aff9e9 Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task Christophe Vilayphiou 2012-08-01 02:43:06 +08:00
• c951cc6b6f Fix for data_migration Christophe Vilayphiou 2012-08-01 00:58:59 +08:00
• 7accbed1a0 gallery translation supported Harry Bomrah 2012-07-31 21:15:42 +08:00
• b2f28eabaf Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-07-31 18:23:01 +08:00
• b989f458d3 Do not show news/anc if no context. Matthew K. Fu JuYuan 2012-07-31 18:22:40 +08:00
• 0078c97b19 Merge branch 'master' of github.com:Rulingcom/NCCU Christophe Vilayphiou 2012-07-31 14:27:44 +08:00
• 9f859b903d Add custom validator and fix .html_safe with rescue Christophe Vilayphiou 2012-07-31 14:25:46 +08:00
• 7e3b59c09a finished tag clouds Matthew K. Fu JuYuan 2012-07-31 11:57:32 +08:00
• af4865ceb7 Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-07-31 11:01:11 +08:00
• 4dea025c8a fix for 1.Announcement 15 per page 2.Search keywords. 3.Redis search index with new code. Matthew K. Fu JuYuan 2012-07-31 10:59:48 +08:00
• 19b60a2ddb Merge branch 'desktop_harry' into desktop_devin Harry Bomrah 2012-07-31 01:16:43 +08:00
• 45da2971ef Merge branch 'gallery_orbit' into desktop_harry Harry Bomrah 2012-07-31 01:16:22 +08:00
• 17dffb15e1 Major updates for gallery Harry Bomrah 2012-07-31 01:15:48 +08:00
• ecb75fd085 Fix typo Christophe Vilayphiou 2012-07-30 18:37:20 +08:00
• 39b63a970c Fix .class to .class.to_s Christophe Vilayphiou 2012-07-30 18:34:54 +08:00
• f3ccbce5c8 Put back impressions for new and bulletin. Add view_count field to tag. Christophe Vilayphiou 2012-07-30 17:57:55 +08:00
• 4d7a53866e Delete remaining impressionist files Christophe Vilayphiou 2012-07-30 17:45:26 +08:00
• 7440727acd Fix: "._type" to ".class" Christophe Vilayphiou 2012-07-30 17:21:37 +08:00
• bb154f5be6 fix error when creating bulletin and news Matthew K. Fu JuYuan 2012-07-30 16:38:02 +08:00
• 4e1a91ed90 Merge branch 'changing_tag' Matthew K. Fu JuYuan 2012-07-30 14:43:53 +08:00
• effad63c92 make sure no pending news or announcement will be searched out Matthew K. Fu JuYuan 2012-07-30 14:39:40 +08:00
• 946ec9306f first version of tag cloud. Matthew K. Fu JuYuan 2012-07-30 11:59:20 +08:00
• 929cd3b0cc Gallery update.. Harry Bomrah 2012-07-29 18:52:30 +08:00
• afa4b7dcb3 Remove cache Christophe Vilayphiou 2012-07-28 16:06:44 +08:00
• a6a8fe3d64 Remove remaining 18n_variables Christophe Vilayphiou 2012-07-27 19:37:25 +08:00
• 23854e7adc Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var Christophe Vilayphiou 2012-07-27 19:21:39 +08:00
• cd6d95204f Move Impressionist to Gemfile Christophe Vilayphiou 2012-07-27 19:12:39 +08:00
• a657a7d615 remove cache Matthew K. Fu JuYuan 2012-07-26 15:44:53 +08:00
• f76b1c02b5 first version of mid_site_sync for new i18n var Matthew K. Fu JuYuan 2012-07-26 14:57:22 +08:00
• a8cc581279 Sitemap done for backend and fronted Christophe Vilayphiou 2012-07-27 16:53:12 +08:00
• 934b515914 Sitemap with main Christophe Vilayphiou 2012-07-27 12:05:17 +08:00
• 38804bd118 Add disable for main title Christophe Vilayphiou 2012-07-26 15:37:29 +08:00