Commit Graph

480 Commits

Author SHA1 Message Date
chris2tof 88397d2708 Modification of parser.rb for page rendering 2011-09-01 13:30:01 +08:00
chris2tof 492f691469 Modifications for menu in Design 2011-09-01 09:12:49 +08:00
chris2tof 98d6c3fa15 Fix blog module 2011-08-25 19:02:20 +08:00
chris2tof 294e06d630 Change "RulingSite" into "Orbit" 2011-08-25 17:59:49 +08:00
chris2tof 983c86e653 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 16:04:47 +08:00
chris2tof f99321c279 production mode 2011-08-25 15:59:20 +08:00
chris2tof 8b576cac48 Fix bug when selecting theme 2011-08-25 15:44:52 +08:00
chris2tof 230842d26a Ika fix bug 2011-08-25 15:44:51 +08:00
chris2tof 32849f1d1b Set default design to first design 2011-08-25 15:08:42 +08:00
chris2tof c248b729db CSS problem for page 2011-08-25 15:08:23 +08:00
chris2tof f898a29fdf Add site link in menu 2011-08-25 08:56:01 +08:00
chris2tof 2afe961416 Modify check if site is up-to-date 2011-08-25 08:30:18 +08:00
chris2tof 4540f23a3f Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 08:18:22 +08:00
chris2tof c427e2af14 Page form with drop down. Modifications for Designs 2011-08-25 08:13:38 +08:00
chris2tof c678545160 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 08:08:09 +08:00
chris2tof 4cd9854706 Ika's changes 2011-08-25 08:07:18 +08:00
chris2tof 27d47215e9 Modify edit page. Still need to handle "form" with drop down lists 2011-08-24 02:34:24 +08:00
chris2tof 1d214bedec Revert "Revert "Clean code and add 'name' in theme.rb""
This reverts commit 00813c9060.
2011-08-24 02:06:27 +08:00
chris2tof 00813c9060 Revert "Clean code and add 'name' in theme.rb"
This reverts commit 608180646b.
2011-08-24 02:04:54 +08:00
chris2tof 608180646b Clean code and add 'name' in theme.rb 2011-08-24 01:39:28 +08:00
chris2tof 118455aa81 Check if site is up-to-date 2011-08-23 19:40:49 +08:00
chris2tof 090b1fdd7f rails 3.1.rc4 -> rails 3.1.rc6 2011-08-23 19:04:45 +08:00
chris2tof e0e14ddfac Modify purchases list 2011-08-23 16:33:01 +08:00
chris2tof 09cdb9a852 CSS modifications for design team 2011-08-23 15:59:07 +08:00
chris2tof 2842001a3b Update source: pull from git 2011-08-23 15:01:22 +08:00
chris2tof 4f38074932 content.css -> content.css.erb 2011-08-23 10:05:16 +08:00
chris2tof 2cdb5a756d Set store_ip in config.yml 2011-08-22 14:01:51 +08:00
chris2tof 7a4ad240a8 Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
chris2tof e74f2931b1 Modifications asset pipeline 2011-08-20 22:54:07 +08:00
chris2tof 20afb23a5f Embed layout_parts in layout and correct typo 2011-08-18 16:27:04 +08:00
chris2tof 86443661e9 Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
Kaito d2c2e174ac uploading is ok,checking parsing result is needed 2011-08-16 17:10:16 +08:00
Kaito d75dd4f936 completing the code with segment fault 2011-08-16 12:14:01 +08:00
Kaito 8895b9fe20 automate get files with anyname 2011-08-15 18:47:02 +08:00
Kaito 16001fb2c9 fix segment fault 2011-08-12 18:11:51 +08:00
Kaito f6ae58cef4 Trying to create Design from upload package 2011-08-12 17:47:03 +08:00
Kaito e0811c14db adding upload package for design. bugs in 2011-08-11 18:20:16 +08:00
Kaito 34d0b8fac1 complete new parser for layout_part 2011-08-10 17:28:10 +08:00
chris2tof 278938a52d Fixed: layout.file is saved when the design is created 2011-08-08 17:51:37 +08:00
Kaito 9cea77430f dealing with layout file bug 2011-08-08 17:23:20 +08:00
Kaito 37633ac23d put layout object as embeded obj in design. have bug with solving uploading file 2011-08-08 12:29:32 +08:00
Kaito 706ec745c3 modified V,C,M related with layout and have bug between layout and design 2011-08-08 09:30:44 +08:00
Kaito c8d58e30aa make design work with layout and testing with package andreas05 within r tag 2011-08-01 18:17:28 +08:00
Kaito b6db304579 add nokogiri into Gemfile and fixing dup bug again... 2011-07-29 17:49:10 +08:00
Kaito c9e4d0f345 in design,after online editing,return json url,callback not finish 2011-07-28 18:54:31 +08:00
Kaito 1839269581 finishing saving edited file online and redo dev.rake modification 2011-07-28 18:08:16 +08:00
Kaito 9eb80d7424 Made r_editor into class style add functions 2011-07-27 17:23:01 +08:00
Kaito dabd6dd5b5 Fixing upload bug 2011-07-26 18:22:17 +08:00
Kaito 1ac10e70a2 redo lost code.... 2011-07-22 16:28:41 +08:00
Kaito a272b871e2 complete del and destroy funciton for desgin 2011-07-22 15:54:38 +08:00