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

• 46b1d55ff6 Complete new interface Fu Matthew 2013-01-14 18:49:23 +08:00
• 6a5c1d9007 member role edit unknown 2013-01-14 18:19:14 +08:00
• f589439870 Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop chris 2013-01-14 18:06:56 +08:00
• da283e136b correct personal journal language, but now hava no language config Rueshyna 2013-01-11 16:11:46 +08:00
• 1b6bfdb80f modularize personal journal and pull relational setting in desktop/index.rb Rueshyna 2013-01-11 10:55:19 +08:00
• 68e14a7898 move js file to relational module but have js require problem Rueshyna 2013-01-09 16:16:47 +08:00
• 919f951981 restore js,journal_pages.js, Rueshyna 2013-01-09 14:40:58 +08:00
• a183ac6041 fixed journal type page Rueshyna 2013-01-09 10:57:52 +08:00
• bf31d0c3dd modularized personal journal Rueshyna 2013-01-08 18:12:28 +08:00
• 758cab5ecd move journal code to persional_journal modulaar Rueshyna 2013-01-08 15:53:02 +08:00
• 284bf34fec amend file value to correct format Rueshyna 2013-01-08 11:01:23 +08:00
• 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back chris 2013-01-14 17:46:27 +08:00
• 141eb7e723 Add mobile but remove news in it chris 2012-12-20 03:21:50 +08:00
• 03c8d42138 Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin chris 2013-01-14 17:04:06 +08:00
• 54d098baf2 Change translation chris 2013-01-08 17:30:36 +08:00
• 84e4a558be member roles edit unknown 2013-01-08 16:58:01 +08:00
• 4e2cbac027 Remove bottom padding if no footer in mobile Add a method in routes Copy mobile routes under the scope 'app' for app usage chris 2013-01-11 19:14:48 +08:00
• 91d1487a04 Fix mobile banner, icons, announcement css chris 2013-01-11 18:34:20 +08:00
• d00192f018 Fix for mobile icon and iphone5 fullscreen chris 2013-01-11 17:00:09 +08:00
• c224d04a70 correct personal journal language, but now hava no language config Rueshyna 2013-01-11 16:11:46 +08:00
• 5a4f681cfc Fix the tooltips overflow chris 2013-01-11 12:24:50 +08:00
• de39bce4ce Fix the tooltips chris 2013-01-11 12:13:16 +08:00
• b90e8efb1f Fix filter not collapsing Fix icon size for button chris 2013-01-11 11:37:11 +08:00
• a7d1cdbb75 Fix for link in ad banner chris 2013-01-11 11:28:13 +08:00
• c888d9cae4 modularize personal journal and pull relational setting in desktop/index.rb Rueshyna 2013-01-11 10:55:19 +08:00
• 92f3be3200 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-10 18:18:02 +08:00
• b950ad64c0 fix for fronted editing not responding for announcement. Fu Matthew 2013-01-10 18:17:27 +08:00
• ca51ebc08c apply view Fu Matthew 2013-01-10 18:00:58 +08:00
• e24f7a7880 Put back some field so ad_image can work chris 2013-01-10 11:08:57 +08:00
• 08adb887c5 change *default* to *defulat* Rueshyna 2013-01-10 09:40:52 +08:00
• c36f3152f5 Changes in css for structure icon and sidebar padding chris 2013-01-09 21:35:54 +08:00
• 1c1839fc00 Remove useless code in de_image.rb chris 2013-01-09 21:16:57 +08:00
• 02e5e52159 Translation typo Remove test values in ad_image form Remove NeedReset chris 2013-01-09 19:08:25 +08:00
• 48ce2278d0 Update disable time when separated picker new or reset date chris 2013-01-09 18:00:38 +08:00
• b49251afee Date picker separated: reset time when reset date chris 2013-01-09 17:08:09 +08:00
• 1d405c3ffe Add "tag" icon to orbit bar chris 2013-01-09 21:16:29 +08:00
• d8f6ebb153 Fix icons chris 2013-01-09 21:15:37 +08:00
• 7434d36e9b Ray's changes for icon size chris 2013-01-09 19:20:04 +08:00
• 933ac7b8fe Ray's changes for icon css chris 2013-01-09 18:01:23 +08:00
• 41dff814fb Change icons chris 2013-01-09 15:57:31 +08:00
• d0f474c2ab fix wrong i18n Fu Matthew 2013-01-09 17:13:25 +08:00
• 5ab4bbd367 add ad_banner inner page,pic title. Fu Matthew 2013-01-09 16:54:33 +08:00
• bc031f34f6 move js file to relational module but have js require problem Rueshyna 2013-01-09 16:16:47 +08:00
• 97eb9e19f9 restore js,journal_pages.js, Rueshyna 2013-01-09 14:40:58 +08:00
• 614b6fde71 fix wrong html structure for announcement frontend Fu Matthew 2013-01-09 12:13:55 +08:00
• 1d80b39dcb Fix no responding when trying to access front end page chris 2013-01-09 11:23:18 +08:00
• bc3cba5ebc fixed journal type page Rueshyna 2013-01-09 10:57:52 +08:00
• fac4faad6c Change date picker chris 2013-01-09 05:18:16 +08:00
• 4938198357 modularized personal journal Rueshyna 2013-01-08 18:12:28 +08:00
• 96ef70aba4 move journal code to persional_journal modulaar Rueshyna 2013-01-08 15:53:02 +08:00
• ded445aae3 amend file value to correct format Rueshyna 2013-01-08 11:01:23 +08:00
• 9c8bf1ffab Change translation chris 2013-01-08 17:30:36 +08:00
• 9584d67b23 member roles edit unknown 2013-01-08 16:58:01 +08:00
• 81d4481797 Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config Fu Matthew 2013-01-08 14:18:04 +08:00
• 76296ab29b Merge branch 'sidebar_config' into ntu Fu Matthew 2013-01-08 14:17:21 +08:00
• 5b13c53ed9 Ika's changes in default_widget.css chris 2013-01-08 12:50:28 +08:00
• 66dafbb2a0 Put impressionist delayed job in a patch chris 2013-01-08 12:45:15 +08:00
• e3d34263e3 Schedule job for tag_cloud chris 2013-01-08 12:36:50 +08:00
• 423e2ac54e Update bootstrap version 2.2.2 chris 2013-01-07 17:25:32 +08:00
• 67136cf595 Merge branch 'ntu_default_widget' of github.com:Rulingcom/orbit into ntu_default_widget chris 2013-01-07 17:22:01 +08:00
• 7594e1b9a6 fix member has no module_app Fu Matthew 2013-01-07 14:04:14 +08:00
• b71ebb3982 clean default widget Fu Matthew 2013-01-07 12:09:36 +08:00
• 5793f0fe5d default widget link. make sure to run rake migrate:make_default_widget_work_config for changing announcement module app Fu Matthew 2013-01-04 18:42:25 +08:00
• a34da20e48 Merge branch 'master' into desktop Rueshyna 2013-01-07 16:44:05 +08:00
• ad5ee83c01 Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2013-01-07 16:43:35 +08:00
• 4ee683aa9b fixed desktop route Rueshyna 2013-01-07 16:38:02 +08:00
• 137beabde9 fix member has no module_app Fu Matthew 2013-01-07 14:04:14 +08:00
• 35e0011111 Merge remote-tracking branch 'remotes/origin/publication' into desktop Rueshyna 2013-01-07 12:44:30 +08:00
• abbecfbe2f clean default widget Fu Matthew 2013-01-07 12:09:36 +08:00
• dc895b84c1 Changes for THU thu chris 2013-01-07 10:45:27 +08:00
• 83935aaa60 Add translations chris 2013-01-07 10:42:17 +08:00
• 6c6bda988d Add mobile version in site settings chris 2013-01-07 03:57:36 +08:00
• 37740adb24 Add mobile but remove news in it chris 2012-12-20 03:21:50 +08:00
• 9745bcf7f1 Remove mysql chris 2012-12-22 17:35:59 +08:00
• c6111460f5 Fix album widget options chris 2013-01-07 00:40:43 +08:00
• be00cec4d7 Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end chris 2013-01-07 00:36:48 +08:00
• 5efbe07fbe default widget link. make sure to run rake migrate:make_default_widget_work_config for changing announcement module app Fu Matthew 2013-01-04 18:42:25 +08:00
• 736bda0679 Add link to default widget (temporary) chris 2013-01-04 12:33:37 +08:00
• 529197eb8c Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget chris 2013-01-04 12:31:32 +08:00
• ac6da1340a Ika's fix for width nccu 2013-01-04 12:19:24 +08:00
• de2e57f681 Ika's fix for width nccu 2013-01-04 12:19:24 +08:00
• 7e045959b6 Gallery i18n chris 2013-01-04 12:01:32 +08:00
• b6f723d42d Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget chris 2013-01-04 11:56:09 +08:00
• ea2d38b23b Ika's changes for css default widgets nccu 2013-01-04 11:43:03 +08:00
• d4c470f76f Ika's changes for css default widgets nccu 2013-01-04 11:43:03 +08:00
• 3e8b029c5f change bulletin object to bulletin title Rueshyna 2013-01-04 10:50:08 +08:00
• a0868a05ac Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-04 09:43:38 +08:00
• 49e289e0fd fixing default widget error when needs image Fu Matthew 2013-01-03 20:07:05 +08:00
• 39f715319b Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-03 19:41:52 +08:00
• a70110f787 make default widget works without init Fu Matthew 2013-01-03 19:38:14 +08:00
• fa83dbf791 Fix order in structure chris 2013-01-03 19:12:52 +08:00
• 5b289bc1d2 Fix old tags chris 2013-01-03 12:16:02 +08:00
• fd2b176798 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 18:40:41 +08:00
• 8815533075 correct pic file format Rueshyna 2013-01-03 18:16:00 +08:00
• 1856d2395d complete page error handler logic Fu Matthew 2013-01-03 15:35:14 +08:00
• 8e33313b13 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 14:47:18 +08:00
• cb3a9ea98b change sub_menu to header in site setting Rueshyna 2013-01-03 14:46:02 +08:00
• 6da528ef98 show error message when trying to show a not existed page Fu Matthew 2013-01-03 13:50:27 +08:00
• 80f545966e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 12:25:50 +08:00
• 5d6279a9ea fix calendar broken Fu Matthew 2013-01-03 10:58:52 +08:00