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

• 9101a2921e Modifications for image urls chris2tof 2011-09-01 19:08:45 +08:00
• f78400c274 Clean code chris2tof 2011-09-01 19:06:49 +08:00
• a570be1811 Skip callbacks chris2tof 2011-09-01 18:28:04 +08:00
• 88397d2708 Modification of parser.rb for page rendering chris2tof 2011-09-01 13:30:01 +08:00
• 492f691469 Modifications for menu in Design chris2tof 2011-09-01 09:12:41 +08:00
• 98d6c3fa15 Fix blog module chris2tof 2011-08-25 19:02:20 +08:00
• 294e06d630 Change "RulingSite" into "Orbit" chris2tof 2011-08-25 17:59:49 +08:00
• 983c86e653 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 chris2tof 2011-08-25 16:04:47 +08:00
• f99321c279 production mode chris2tof 2011-08-25 15:59:20 +08:00
• 8b576cac48 Fix bug when selecting theme chris2tof 2011-08-25 15:44:52 +08:00
• 230842d26a Ika fix bug chris2tof 2011-08-25 15:44:51 +08:00
• 32849f1d1b Set default design to first design chris2tof 2011-08-25 15:08:31 +08:00
• c248b729db CSS problem for page chris2tof 2011-08-25 15:08:23 +08:00
• f898a29fdf Add site link in menu chris2tof 2011-08-25 08:56:01 +08:00
• 2afe961416 Modify check if site is up-to-date chris2tof 2011-08-25 08:30:09 +08:00
• 4540f23a3f Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 chris2tof 2011-08-25 08:18:22 +08:00
• c427e2af14 Page form with drop down. Modifications for Designs chris2tof 2011-08-25 08:13:38 +08:00
• c678545160 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 chris2tof 2011-08-25 08:08:09 +08:00
• 4cd9854706 Ika's changes chris2tof 2011-08-25 08:07:18 +08:00
• 27d47215e9 Modify edit page. Still need to handle "form" with drop down lists chris2tof 2011-08-24 02:34:24 +08:00
• 1d214bedec Revert "Revert "Clean code and add 'name' in theme.rb"" chris2tof 2011-08-24 02:06:27 +08:00
• 00813c9060 Revert "Clean code and add 'name' in theme.rb" chris2tof 2011-08-24 02:04:54 +08:00
• 608180646b Clean code and add 'name' in theme.rb chris2tof 2011-08-24 01:39:28 +08:00
• 118455aa81 Check if site is up-to-date chris2tof 2011-08-23 19:40:49 +08:00
• 090b1fdd7f rails 3.1.rc4 -> rails 3.1.rc6 chris2tof 2011-08-23 19:04:45 +08:00
• e0e14ddfac Modify purchases list chris2tof 2011-08-23 16:33:01 +08:00
• 09cdb9a852 CSS modifications for design team chris2tof 2011-08-23 15:59:07 +08:00
• 2842001a3b Update source: pull from git chris2tof 2011-08-23 15:01:22 +08:00
• 4f38074932 content.css -> content.css.erb chris2tof 2011-08-23 10:05:16 +08:00
• 2cdb5a756d Set store_ip in config.yml chris2tof 2011-08-22 14:01:51 +08:00
• 7a4ad240a8 Clean code for layout and modifications in dev.rake chris2tof 2011-08-22 13:45:21 +08:00
• e74f2931b1 Modifications asset pipeline chris2tof 2011-08-20 22:54:07 +08:00
• 20afb23a5f Embed layout_parts in layout and correct typo chris2tof 2011-08-18 16:27:04 +08:00
• 86443661e9 Merge server and rails_3_1 chris2tof 2011-08-18 13:43:33 +08:00
• d2c2e174ac uploading is ok,checking parsing result is needed Kaito 2011-08-16 17:10:16 +08:00
• d75dd4f936 completing the code with segment fault Kaito 2011-08-16 12:14:01 +08:00
• 8895b9fe20 automate get files with anyname Kaito 2011-08-15 18:47:02 +08:00
• 16001fb2c9 fix segment fault Kaito 2011-08-12 18:11:51 +08:00
• f6ae58cef4 Trying to create Design from upload package Kaito 2011-08-12 17:47:03 +08:00
• e0811c14db adding upload package for design. bugs in Kaito 2011-08-11 18:20:16 +08:00
• 34d0b8fac1 complete new parser for layout_part Kaito 2011-08-10 17:28:10 +08:00
• 278938a52d Fixed: layout.file is saved when the design is created chris2tof 2011-08-08 17:51:37 +08:00
• 9cea77430f dealing with layout file bug Kaito 2011-08-08 17:23:20 +08:00
• 37633ac23d put layout object as embeded obj in design. have bug with solving uploading file Kaito 2011-08-08 12:29:32 +08:00
• 706ec745c3 modified V,C,M related with layout and have bug between layout and design Kaito 2011-08-08 09:30:44 +08:00
• c8d58e30aa make design work with layout and testing with package andreas05 within r tag Kaito 2011-08-01 18:17:28 +08:00
• b6db304579 add nokogiri into Gemfile and fixing dup bug again... Kaito 2011-07-29 17:49:10 +08:00
• c9e4d0f345 in design,after online editing,return json url,callback not finish Kaito 2011-07-28 18:54:31 +08:00
• 1839269581 finishing saving edited file online and redo dev.rake modification Kaito 2011-07-28 18:08:16 +08:00
• 9eb80d7424 Made r_editor into class style add functions Kaito 2011-07-27 17:23:01 +08:00
• dabd6dd5b5 Fixing upload bug Kaito 2011-07-26 18:22:17 +08:00
• 1ac10e70a2 redo lost code.... Kaito 2011-07-22 16:28:41 +08:00
• a272b871e2 complete del and destroy funciton for desgin Kaito 2011-07-22 15:54:38 +08:00
• 29ce3199ec complete del and destroy funciton for desgin Kaito 2011-07-22 15:53:42 +08:00
• 6903dc3037 adding modified design.rb for sloving dup prob Kaito 2011-07-22 11:10:14 +08:00
• 2f4c2b2d9b recovery from my last edit Kaito 2011-07-22 11:07:29 +08:00
• 9898bd9df7 Modification in JS to upload more than 2 files chris2tof 2011-07-21 11:22:31 +08:00
• f8d1a1315b fixing duplicate when updating design Matthew Fu 2011-07-20 17:05:28 +08:00
• e3a50ccf69 move design file field to partial Matthew Fu 2011-07-20 14:04:16 +08:00
• 612ed629bc fix design upload Matthew Fu 2011-07-20 09:58:24 +08:00
• c48a11d9f5 Add some JS for design uploading Matthew Fu 2011-07-19 18:31:53 +08:00
• c3ada90365 CarrierWave workaround: the files have to be saved manually chris2tof 2011-07-14 08:48:42 +08:00
• f73f09ffcf adding files not commited from previous commit Matthew Fu 2011-07-12 16:02:41 +08:00
• f387139ae1 rails 3.1 and designs (with bug) Matthew Fu 2011-07-12 16:00:57 +08:00
• 842dc9ee7a Merge branch 'master' of https://github.com/Rulingcom/orbit chris2tof 2011-06-14 15:20:58 +08:00
• 7215b56f7e changes for windows unknown 2011-06-14 15:04:37 +08:00
• 96a43f023e Edit code (HTML response) chris2tof 2011-06-10 15:02:34 +08:00
• a695b9ad29 Items UI changes chris2tof 2011-06-10 13:57:42 +08:00
• 247b8ec4dc HTML code can be modify (paser: update) chris2tof 2011-06-10 10:31:50 +08:00
• dda4b30d67 Set editable parts chris2tof 2011-06-01 15:49:55 +08:00
• c7fc7084d5 Tag 'link' chris2tof 2011-06-01 15:49:21 +08:00
• 7b5ea870a0 Delete page. chris2tof 2011-06-01 12:00:41 +08:00
• ddc7c74436 Create page. chris2tof 2011-06-01 10:24:14 +08:00
• 2522cde2f5 Edition of page part for multiple languages. chris2tof 2011-05-27 11:27:54 +08:00
• 0969f6b6cc CKEditor. The error came from some script in Application.js chris2tof 2011-05-26 13:48:09 +08:00
• 964440fa86 Remove CKEditor due to conflicts with the jQuery library chris2tof 2011-05-26 11:23:46 +08:00
• a8c4e17c56 CKEditor. Edition of page part for single language. chris2tof 2011-05-25 16:27:17 +08:00
• d971a8ecbe Uniformized: @page and @ link in @item Change parser for page edition. chris2tof 2011-05-25 14:50:56 +08:00
• 3d97c5bfda Modification of the page model chris2tof 2011-05-18 10:00:00 +08:00
• 4399804e19 Delete link handle JavaScript disabled chris2tof 2011-05-13 09:59:29 +08:00
• 24ae7ed5e3 Links edition chris2tof 2011-05-13 09:08:42 +08:00
• d9ba76ebd5 - No more Home object - Sitemap on the left side and view of the current page in the main block chris2tof 2011-05-09 18:49:57 +08:00
• 9fdfb140d3 Not needed in Rails 3 chris2tof 2011-05-02 15:59:02 +08:00
• 2e632f1596 #request_uri is deprecated. chris2tof 2011-05-02 13:28:38 +08:00
• 43d87ecf98 Destroy user_attributes and attribute_values when a user is destroyed chris2tof 2011-05-02 13:23:39 +08:00
• 83bbd77d96 Built-in user_attribute_models chris2tof 2011-05-02 12:07:31 +08:00
• 509c106b3e Modifications of the user model chris2tof 2011-04-28 22:47:34 +08:00
• 1909edbe2a Simplification of the 'link_back' code chris2tof 2011-04-19 15:05:48 +08:00
• d88cae437d update gem bson_ext and devise initializer chris2tof 2011-04-14 13:40:16 +08:00
• 4ed6e8090e Remove useless rspec.rake ihower 2011-04-13 19:19:40 +08:00
• e428953d97 remove useless script ihower 2011-04-13 19:18:40 +08:00
• cc69870716 Update README ihower 2011-04-13 19:06:09 +08:00
• 14c357fd9f Update README ihower 2011-04-13 19:04:49 +08:00
• 99d83279f5 Update gems and install rspec ihower 2011-04-13 19:02:18 +08:00
• 8a4cffae8f Remove files which should be deleted in previous commit ihower 2011-04-13 18:46:15 +08:00
• 2f9dcf7791 set bson_ext version to 1.2.4 because of 1.3.0 bug install chris 2011-04-13 16:57:27 +08:00
• 6db9727829 revert to mongoid 2.0.0 and remove reroute_middleware chris 2011-04-13 16:39:46 +08:00
• 106db069fd update radius, modify routes to handle modules, add blog module chris 2011-04-12 15:21:25 +08:00
• 0067ac48a5 include Mongoid::Timestamps chris 2011-03-08 17:25:46 +08:00
• fa81b04eee fix bug: quotes in html tags chris 2011-03-04 09:31:21 +08:00