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

• 7e7fc69a37 add announcemet search & set top unknown 2012-01-13 19:15:03 +08:00
• 42c89220e3 Manger and SubManager Matthew Fu 2012-01-13 18:20:04 +08:00
• a55a93cb3b Add exception notification in development env Christophe Vilayphiou 2012-01-13 15:49:07 +08:00
• 4cdef76550 Update carrierwave chris2tof 2012-01-13 12:35:46 +08:00
• 4b838b5ef5 edit announcement upload & show unknown 2012-01-12 18:38:50 +08:00
• 4be97f6ea6 Merge branch 'fix_it' chris2tof 2012-01-12 18:15:43 +08:00
• c0efb5d1bc Listing for Module-apps Matthew Fu 2012-01-12 14:13:41 +08:00
• ec235bcaa3 merge with master unknown 2012-01-11 20:31:52 +08:00
• 9f93af100b merge with master unknown 2012-01-11 20:14:28 +08:00
• 3d9fd359ed Moving Orbit frontend and widget controller to controllers folder Matthew Fu 2012-01-10 18:30:08 +08:00
• cae3daa9c4 Change NewBlog to new_blog Matthew Fu 2012-01-10 18:29:11 +08:00
• 79f778ad8c creating for disabling widgets and frontend Matthew Fu 2012-01-05 16:21:33 +08:00
• 7b40706aed fixing for app_auth Matthew Fu 2012-01-05 16:20:51 +08:00
• 1dd85d6ff1 Forgot to remove ":remote => true" for asset new chris2tof 2011-12-30 02:34:13 +08:00
• 0edad4f8c0 New rss.js from Harry and fix html form for assets chris2tof 2011-12-29 19:45:21 +08:00
• 7ebfe3a7f9 Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug chris2tof 2011-12-29 18:08:08 +08:00
• d85f29e65c Fix missing modification for "panel_main" to "back_main" chris2tof 2011-12-29 17:49:48 +08:00
• b298aef031 Delete tmp files chris2tof 2011-12-29 17:41:20 +08:00
• c1238a7043 Prefix ids with "back_" in back-end layout to avoid conflict with site's ids chris2tof 2011-12-29 15:35:13 +08:00
• ea19f11fe2 Integrate Harry's modifications to reload pop-up content chris2tof 2011-12-29 14:09:06 +08:00
• b002c411ce Merge branch 'design_team' chris2tof 2011-12-28 21:03:35 +08:00
• 75c9851dbc Ray's back-end modifications for sub-roles Christophe Vilayphiou 2011-12-28 20:57:18 +08:00
• a57dd62281 Merge branch 'js_pop_up' chris2tof 2011-12-28 20:52:33 +08:00
• 090493fd51 Re-commit chris2tof 2011-12-28 20:51:52 +08:00
• 245def9cb6 Integration of pop-up and generic js.erb chris2tof 2011-12-28 20:49:53 +08:00
• 210a7fde48 Delete useless files chris2tof 2011-12-28 15:11:07 +08:00
• 62aaf79491 Merge with sub_roles chris2tof 2011-12-23 18:34:21 +08:00
• fc591ee308 Ray's back_end modification before sub_roles Christophe Vilayphiou 2011-12-23 18:02:45 +08:00
• d3ca1647be fix page form bugs Matthew Fu 2011-12-23 13:54:28 +08:00
• a9f06b9517 Divide parser into sub-parsers chris2tof 2011-12-22 16:23:48 +08:00
• 1f9197e438 Remove NewBlog from plugins chris2tof 2011-12-22 15:53:34 +08:00
• d465febca7 merge with november_presentation chris2tof 2011-12-22 15:43:38 +08:00
• fa27bfc86b Delete residual files from radius chris2tof 2011-12-22 11:30:46 +08:00
• 708a174345 Remove radius from plugins, put it in Gemfile chris2tof 2011-12-22 11:27:37 +08:00
• e7c9816139 Move NewBlog to built_in_modules and delete "vendor/templates" chris2tof 2011-12-22 01:38:27 +08:00
• 95c40d2e53 Add plugins directories chris2tof 2011-12-22 01:27:26 +08:00
• a09f8e4551 merge with november_presentation chris2tof 2011-12-20 16:47:17 +08:00
• afbffe37d5 Users can now be saved with sub_roles chris2tof 2011-12-20 14:35:28 +08:00
• 4108ebf06d Fix mongoid deeply nested polimorphic chris2tof 2011-12-19 21:22:26 +08:00
• d27d7a623c Changes for sub_roles chris2tof 2011-12-18 10:07:42 +08:00
• d23cf152da Merge 'standardization' and 'role structure modification' chris2tof 2011-12-10 18:21:59 +08:00
• b7ac5478b4 Change role structure chris2tof 2011-12-10 18:12:39 +08:00
• f774084e9a Back-end standardization Christophe Vilayphiou 2011-12-10 18:03:32 +08:00
• e0cdedfa2e Remove useless controller and view chris2tof 2011-12-06 18:12:12 +08:00
• b77282c643 Test redmine service-hook chris2tof 2011-12-05 19:28:06 +08:00
• c0fbb999e7 Modification of Gemfile for linux Christophe Vilayphiou 2011-12-05 19:19:05 +08:00
• 4a56e78271 Change .rvmrc chris2tof 2011-12-05 16:35:48 +08:00
• 227ca0d43a Update gems chris2tof 2011-12-05 16:29:22 +08:00
• 69a8fce64a Fix double loading bug chris2tof 2011-12-05 11:22:32 +08:00
• 77842ab37d Remove calendar chris2tof 2011-12-05 10:44:10 +08:00
• 26b49dcf02 Remove js from html chris2tof 2011-12-05 10:36:25 +08:00
• 962bf03af2 Remove snippet chris2tof 2011-12-05 10:27:22 +08:00
• f3f405c1b4 Remove useless files in items chris2tof 2011-12-05 09:56:26 +08:00
• 75a3c4d5b1 Modify assets chris2tof 2011-12-05 09:54:41 +08:00
• a0ec38ca99 Merge with branch november_presentation chris2tof 2011-12-01 13:50:49 +08:00
• b68f5e11e5 Final modifications for the presentation chris2tof 2011-11-22 18:54:10 +08:00
• 1fcacbb4af Matt's code for NewBlog interface chris2tof 2011-11-20 12:59:04 +08:00
• 66bc0ce560 Modified dev.rake chris2tof 2011-11-20 03:16:35 +08:00
• a03e9bada8 Add missing translations chris2tof 2011-11-20 02:14:51 +08:00
• c9137737e3 Resolve conflicts chris2tof 2011-11-20 01:35:28 +08:00
• e99affbddd Merge with Matt's code chris2tof 2011-11-20 01:26:24 +08:00
• e4dc5bd107 App block is working with full design now Matthew Fu 2011-11-20 00:03:02 +08:00
• 2754f49fe9 Missing code in parser for displaying image in the fornt-end chris2tof 2011-11-19 23:11:49 +08:00
• ad9f9bbf5c Final Ray's modifications chris2tof 2011-11-19 21:47:18 +08:00
• dac6348402 Integration of module_app workflow chris2tof 2011-11-19 14:33:26 +08:00
• 65349796d0 Ray's modifications chris2tof 2011-11-18 16:43:14 +08:00
• e594242dba Revert "Update NewBlog package with screenshots" Matthew Fu 2011-11-18 10:27:25 +08:00
• bcd5564c31 Update NewBlog package with screenshots Matthew Fu 2011-11-17 14:38:53 +08:00
• 861237d65b Integration of Ray' modifications chris2tof 2011-11-17 20:02:58 +08:00
• c4810274ec Rescue nil values for attribute_values in User chris2tof 2011-11-16 09:47:09 +08:00
• bcf487f264 Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation chris2tof 2011-11-16 18:37:29 +08:00
• 0556dc9297 ika's modification to the backend chris2tof 2011-11-16 18:34:54 +08:00
• 5c3ae104f0 Add log info for asking restart after app module installed Matthew Fu 2011-11-16 17:01:44 +08:00
• 84ebc8306b APP zip package placed in lib now can be unzip into vendor Matthew Fu 2011-11-16 15:21:31 +08:00
• c1d77fa6d6 Changes for purchases - handle different type of purchases chris2tof 2011-11-14 10:22:31 +08:00
• d9d7099da6 Fix bug: users can now be saved chris2tof 2011-11-12 17:54:45 +08:00
• 0a6efeb0a2 put dymanic loading related kernel code and query kernel code into public/static Matthew Kaito Juyuan Fu 2011-10-21 14:11:41 +08:00
• a0f1220b63 changed filename for complete asset pipeline Matthew Kaito Juyuan Fu 2011-10-21 10:38:51 +08:00
• d47db8e395 Remove production.css Matthew Kaito Juyuan Fu 2011-10-20 17:19:35 +08:00
• 0e252cf93c APP fronted showing Matthew Kaito Juyuan Fu 2011-10-20 15:29:54 +08:00
• cb07a35cc9 Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD Matthew Kaito Juyuan Fu 2011-10-20 10:06:06 +08:00
• ff82391b7d Revert "Merge with new_blog" Matthew Kaito Juyuan Fu 2011-10-20 10:01:39 +08:00
• 64c68fcdeb Merge with new_blog chris2tof 2011-10-18 11:36:01 +08:00
• 2e86d8081f Modifications for images in html code chris2tof 2011-10-18 11:21:24 +08:00
• b9fdf5de04 Revert "please delete..." chris2tof 2011-10-13 15:45:02 +08:00
• dd5934c81e please delete... Matthew Kaito Juyuan Fu 2011-10-11 17:21:03 +08:00
• 0ca354cfd0 Clean code and new image uploader chris2tof 2011-09-14 15:11:50 +08:00
• f2e3cb00db Fix bug when editing a page, the theme wasn't including blank chris2tof 2011-09-13 14:03:03 +08:00
• 4db88282a1 Modification in Design structure_css -> default_css chris2tof 2011-09-13 11:57:20 +08:00
• 07ccacb7d7 Modifications of the JS in Design chris2tof 2011-09-09 15:40:13 +08:00
• 77b8fcdd1d Fix previous workaround for the uploaded Design chris2tof 2011-09-09 13:44:43 +08:00
• a571d1dcff Clean code and workaround mongoid embedded with carrierwave chris2tof 2011-09-08 18:12:04 +08:00
• a1391493a3 Revert change in layout/admin.html.erb chris2tof 2011-09-07 14:03:53 +08:00
• 0956e9784a Fix bug in layout, parser and change lib/fraisier chris2tof 2011-09-07 11:53:16 +08:00
• 4ce0bda00b Fix links in the menu when in edit or normal render chris2tof 2011-09-05 16:18:49 +08:00
• 22c9ca4c74 Handle "reset.css" and add link in the generated menu chris2tof 2011-09-05 16:06:17 +08:00
• 151f005815 structure.css -> default.css chris2tof 2011-09-05 15:18:36 +08:00
• f4b1d1e182 Modifications in Layout chris2tof 2011-09-05 01:14:49 +08:00
• b2c0047d0f Modification in parse_urls in both layout.rb and theme.rb chris2tof 2011-09-02 19:19:34 +08:00
• 25355e9c7f Force encoding and stip filename in Theme::parse_urls chris2tof 2011-09-01 19:14:34 +08:00