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

• 5328a26440 Fix structure position chris 2013-10-08 12:33:24 +08:00
• 9fbb2917b1 Widget title without link Bernie Chiu 2013-10-08 12:24:34 +08:00
• fe1869199e Fix typo, it wasn't executing the filtering on tags chris 2013-10-07 19:01:59 +08:00
• 061225f56c Override mongoid-tree callback condition for default position chris 2013-10-07 18:23:54 +08:00
• b3e16ce23b Updated desktop widgets controller saurabhbhatia 2013-10-07 18:13:55 +08:00
• fad191aefe Updated Desktop Inheritence class saurabhbhatia 2013-10-07 17:43:13 +08:00
• 2f866891b1 Limit rubyzip version chris 2013-10-07 16:25:47 +08:00
• 48aa7ed638 Update rake for resetting position Fix codemirror css chris 2013-10-07 16:23:07 +08:00
• 21db2a2cba Drag and drop to reorder users chris 2013-10-07 15:52:10 +08:00
• 47b8b3e277 announcement init sorting fix Spen 2013-10-07 15:09:27 +08:00
• 0b14da0fd8 announcement init sorting fix 1007_announcement_sorting_fix Spen 2013-10-07 15:09:27 +08:00
• 1194bdd9b4 Updated Sitemap with UI fixes - checkbox tag pending saurabhbhatia 2013-10-07 15:04:41 +08:00
• 831bd722b8 Fix site preference openness problem Manson Wang 2013-10-07 14:36:52 +08:00
• 940a915125 Updated Sitemap with new UI saurabhbhatia 2013-10-04 19:42:35 +08:00
• 363ea53861 Removed pagination from video api saurabhbhatia 2013-10-05 16:38:10 +08:00
• b7ea756789 Updated channel videos liks to 3gp format saurabhbhatia 2013-10-04 20:04:44 +08:00
• 792785f7ba Fix relation for Ad_banner and Ad_image Update site.rake for New UI Manson Wang 2013-10-04 19:17:45 +08:00
• 839743779b Updated channel json with number of videos saurabhbhatia 2013-10-04 18:04:47 +08:00
• bd6d94a143 Comment out JavaScript redirect workaround Bernie Chiu 2013-10-04 17:48:58 +08:00
• 8684388ab9 Reverse Bernie Chiu 2013-10-04 17:47:26 +08:00
• f8c7e8f17a fix ntue sub menu link target Spen 2013-10-04 16:02:14 +08:00
• 5e05f5d02b Merge branch '0913_ntu_ga_co' of https://github.com/Rulingcom/orbit into 0913_ntu_ga_co thomaschen 2013-10-04 17:22:33 +08:00
• 6607f6b66e roll back thomaschen 2013-10-04 17:22:02 +08:00
• ebdf124d06 fix ntue sub menu link target ntue_1004_fix Spen 2013-10-04 16:02:14 +08:00
• 63fab74a25 Post form without ajax Bernie Chiu 2013-10-04 15:57:14 +08:00
• 43cf6b70b7 Fix structure reorder position chris 2013-10-04 15:07:24 +08:00
• ba8da9b6bb Updated button class in template form saurabhbhatia 2013-10-04 14:41:48 +08:00
• ff93670949 Updated template editing saurabhbhatia 2013-10-03 12:47:07 +08:00
• 48969b70b5 Modify thank_you route Bernie Chiu 2013-10-04 14:08:18 +08:00
• f85354c2b6 fix new ui link and archive frontend and widget index Spen 2013-10-04 11:43:33 +08:00
• 9f779f1f71 Updated visibility for get channels in api saurabhbhatia 2013-10-04 11:30:06 +08:00
• 95310619c0 Fix the URL for video in channel video api saurabhbhatia 2013-10-04 11:28:28 +08:00
• 55207da76a Updated to 2 steps for android app, channel id and channel related videos saurabhbhatia 2013-10-04 11:27:00 +08:00
• 35733da7ba FGU remote_annoucement url and files fix Spen 2013-10-04 10:59:51 +08:00
• 795d881626 Added video json api saurabhbhatia 2013-10-04 10:15:57 +08:00
• 4cd455441f Updated location json visibility saurabhbhatia 2013-10-03 18:20:16 +08:00
• fea0540ec3 updated json format for location and locaiton categories saurabhbhatia 2013-10-03 17:59:12 +08:00
• 44f5a98a69 Updated Location and loction categories to pass ids saurabhbhatia 2013-10-03 17:30:05 +08:00
• 746bcbed96 added get_categorywise_locations saurabhbhatia 2013-10-03 15:52:46 +08:00
• ec6ef5a871 NTUE localtion categories as json for Android App saurabhbhatia 2013-10-03 15:06:59 +08:00
• 7a3c061ed3 Changes for mobile based on footer 0913_nhu chris 2013-10-03 14:01:35 +08:00
• 06c48524fd Fix tag to remove ['0', '1'] from the form fu chris 2013-10-02 18:36:08 +08:00
• 42decd3ff4 Ad_banner fixed Manson Wang 2013-10-02 15:51:22 +08:00
• a21c5c6d5c Ad_banner fixed Manson Wang 2013-10-02 15:51:22 +08:00
• 31ef12b3da Fix approval link in side bar chris 2013-10-02 15:35:42 +08:00
• 08907aa8c1 Search Engine Preferences complete saurabhbhatia 2013-10-02 15:21:48 +08:00
• b180ef41f7 Fix parser_front_end.rb for page content chris 2013-09-17 18:00:30 +08:00
• b92e533698 YDU Logo Manson Wang 2013-10-02 14:12:54 +08:00
• 31b55a0635 Revert "Updated Orbit js to latest version" saurabhbhatia 2013-10-02 12:32:45 +08:00
• 433c8d5da6 Fix link in category for authorization, fix update of auth users chris 2013-10-02 12:18:20 +08:00
• b18e61a6c0 Updated Orbit js to latest version saurabhbhatia 2013-10-02 12:06:45 +08:00
• 8200baddbb Fix bugs for FGU remote_annoucement Added Subtitle support Handle when there is content in subtitle but no content in text field Manson Wang 2013-10-02 11:09:08 +08:00
• f715924929 Fix bugs for FGU remote_annoucement Handle exception when category is missing Manson Wang 2013-10-02 10:25:27 +08:00
• f851ad0e27 Fix bugs for FGU remote_annoucement Added english support Skip data with blank title Manson Wang 2013-10-02 09:33:24 +08:00
• e4594fb343 Merge branch 'ntu_mb_sso_server' of https://github.com/Rulingcom/orbit into HEAD saurabhbhatia 2013-10-01 18:09:03 +08:00
• 40e1ee751e Updated filename of writing seminars to writing conferences saurabhbhatia 2013-09-27 15:12:30 +08:00
• 69cf567944 sso server for ntu mb server site Spen 2013-09-26 15:31:31 +08:00
• 4df19748ed ntu mb sso logout fix Spen 2013-10-01 17:33:10 +08:00
• 4fe2e31f0e Updated Global css to fix the line height saurabhbhatia 2013-10-01 17:51:07 +08:00
• 31e4fb9f39 Updated sidebar line height saurabhbhatia 2013-10-01 17:47:58 +08:00
• 9bdb633157 Updated with UI Changes saurabhbhatia 2013-10-01 17:39:21 +08:00
• 88c8ca68d0 Add ask fail message and success redirect fix Bernie Chiu 2013-10-01 16:09:43 +08:00
• 8aa1e2dae0 Changes for mobile contact, one line chris 2013-10-01 15:44:44 +08:00
• dd0d2368c8 Changes for mobile based on footer chris 2013-10-01 15:40:29 +08:00
• caca264b50 isotope fixed for all plugins for list and form. harrybomrah 2013-10-01 14:29:39 +08:00
• 9a0e9ddc82 Revert "Updated Bulletins controller with announcement approval fix" saurabhbhatia 2013-10-01 15:03:34 +08:00
• 648ecc1475 isotope fixed for all plugins for list and form. isotope_fix_for_plugins_harry harrybomrah 2013-10-01 14:29:39 +08:00
• 9f490c87d2 Fixed issue with member plugin delete label saurabhbhatia 2013-10-01 10:41:55 +08:00
• a9431ad17e Updated Bulletins controller with announcement approval fix saurabhbhatia 2013-10-01 10:00:56 +08:00
• 27db216d0c Fix Ad_Banner Loading Problem (Not complete) Manson Wang 2013-09-30 21:03:38 +08:00
• e2d09c7379 Fix Ad_Banner Loading Problem (Not complete) Manson Wang 2013-09-30 21:03:38 +08:00
• 9c41282fdb Fix Ad_Banner Loading Problem (Not complete) Manson Wang 2013-09-30 21:03:38 +08:00
• d9ac24470f Updated Member plugin names to remove spaces and generate correct links saurabhbhatia 2013-09-30 18:24:15 +08:00
• 2f673b20ad disabling changes in desktop, missed out in last one harrybomrah 2013-09-30 17:15:32 +08:00
• 0a9fd6a4b5 some needed changes in api for desktop harrybomrah 2013-09-30 16:43:16 +08:00
• 74ca99a581 delete and sequencing fixed for survey questions harrybomrah 2013-09-30 15:47:27 +08:00
• fac578f251 Merge branch '0913_ntue' of https://github.com/Rulingcom/orbit into 0913_ntue saurabhbhatia 2013-09-30 16:36:33 +08:00
• 3b4e4e1098 Fix path of jquery.cycle.all.latest.js Manson Wang 2013-09-26 15:56:43 +08:00
• 8c68c54a57 ad_banner banner load fixed for test site harrybomrah 2013-09-13 12:36:41 +08:00
• 2d8754f0aa NTUE Logo Manson Wang 2013-09-30 14:09:00 +08:00
• 19633a05d8 Fix parser_front_end.rb for page content chris 2013-09-17 18:00:30 +08:00
• 051adbf167 ntue email_ers fix and announcement widget filed fix Spen 2013-09-27 17:06:12 +08:00
• d386307745 Fix params name for rss chris 2013-09-27 16:52:50 +08:00
• 5c0d16c22e Modification in rss feed for announcement: - subtitle instead of text - add rss link in the json for categories chris 2013-09-17 23:11:23 +08:00
• 93424e1972 Fix link frontend and gallery json ruling 2013-09-17 20:55:03 +08:00
• 3c49a6eeae Do not show announcement in json and rss if no title in I18n.locale (fix 2) chris 2013-09-17 20:52:02 +08:00
• f76ead6ea5 Revert "Do not show announcement in json and rss if no title in I18n.locale (fix)" chris 2013-09-17 20:51:29 +08:00
• e8a8e92f5c Do not show announcement in json and rss if no title in I18n.locale (fix) chris 2013-09-17 20:47:27 +08:00
• 5b60e389ec Revert "Do not show announcement in json and rss if no title in I18n.locale" chris 2013-09-17 20:47:03 +08:00
• faabedad55 Do not show announcement in json and rss if no title in I18n.locale chris 2013-09-17 20:44:00 +08:00
• d95b050e57 Changes to have both json and rss, add categories chris 2013-09-17 19:57:54 +08:00
• afe6972dfa link widget for ntue updated harrybomrah 2013-09-17 18:06:20 +08:00
• ce3842d3ad fixed external links opening in different window harrybomrah 2013-09-17 15:51:46 +08:00
• 9fbf9e940e Fix scope error chris 2013-09-16 03:16:23 +08:00
• 0f2c13e7ac First version of new feed for announcement chris 2013-09-16 02:53:16 +08:00
• f42d25c46b ntue emailer approval fix and announcement widget add unit field Spen 2013-08-26 10:43:39 +08:00
• dda603c27c Changes for ntue (mail app) chris 2013-07-19 16:03:14 +08:00
• ecc3581106 Domain absolute url for tinymce files chris 2013-09-30 15:25:06 +08:00
• e56e91cc93 Fix path of jquery.cycle.all.latest.js Manson Wang 2013-09-26 15:56:43 +08:00
• 4b7703f4af ad_banner banner load fixed for test site harrybomrah 2013-09-13 12:36:41 +08:00