Commit Graph

111 Commits

Author SHA1 Message Date
Christophe Vilayphiou 75c9851dbc Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
Christophe Vilayphiou f774084e9a Back-end standardization 2011-12-10 18:03:32 +08:00
chris2tof 26b49dcf02 Remove js from html 2011-12-05 10:36:25 +08:00
chris2tof 962bf03af2 Remove snippet 2011-12-05 10:27:22 +08:00
chris2tof f3f405c1b4 Remove useless files in items 2011-12-05 09:56:26 +08:00
chris2tof 75a3c4d5b1 Modify assets
Each layout has a manifest for css and js
2011-12-05 09:54:41 +08:00
chris2tof a0ec38ca99 Merge with branch november_presentation 2011-12-01 13:50:49 +08:00
chris2tof b68f5e11e5 Final modifications for the presentation 2011-11-22 18:54:10 +08:00
chris2tof a03e9bada8 Add missing translations 2011-11-20 02:14:51 +08:00
chris2tof ad9f9bbf5c Final Ray's modifications 2011-11-19 21:47:18 +08:00
chris2tof dac6348402 Integration of module_app workflow 2011-11-19 14:33:26 +08:00
chris2tof 65349796d0 Ray's modifications 2011-11-18 16:43:14 +08:00
chris2tof 861237d65b Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
chris2tof 0556dc9297 ika's modification to the backend 2011-11-16 18:34:54 +08:00
Matthew Kaito Juyuan Fu cb07a35cc9 Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD 2011-10-20 10:06:06 +08:00
Matthew Kaito Juyuan Fu ff82391b7d Revert "Merge with new_blog"
This reverts commit 64c68fcdeb.
2011-10-20 10:01:39 +08:00
chris2tof 64c68fcdeb Merge with new_blog 2011-10-18 11:36:01 +08:00
chris2tof f2e3cb00db Fix bug when editing a page, the theme wasn't including blank 2011-09-13 14:03:03 +08:00
chris2tof 4db88282a1 Modification in Design structure_css -> default_css 2011-09-13 11:57:20 +08:00
chris2tof 07ccacb7d7 Modifications of the JS in Design 2011-09-09 15:40:13 +08:00
chris2tof 77b8fcdd1d Fix previous workaround for the uploaded Design 2011-09-09 13:44:43 +08:00
chris2tof a571d1dcff Clean code and workaround mongoid embedded with carrierwave 2011-09-08 18:12:04 +08:00
chris2tof 151f005815 structure.css -> default.css
Themes are optional, a theme overrides style in default.css
2011-09-05 15:18:36 +08:00
chris2tof 492f691469 Modifications for menu in Design 2011-09-01 09:12:49 +08:00
chris2tof c248b729db CSS problem for page 2011-08-25 15:08:23 +08:00
chris2tof c427e2af14 Page form with drop down. Modifications for Designs 2011-08-25 08:13:38 +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 e0e14ddfac Modify purchases list 2011-08-23 16:33:01 +08:00
chris2tof 2842001a3b Update source: pull from git 2011-08-23 15:01:22 +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 86443661e9 Merge server and rails_3_1 2011-08-18 13:43:33 +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 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