Commit Graph

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