chris2tof
|
64c68fcdeb
|
Merge with new_blog
|
2011-10-18 11:36:01 +08:00 |
|
chris2tof
|
2e86d8081f
|
Modifications for images in html code
|
2011-10-18 11:21:24 +08:00 |
|
chris2tof
|
b9fdf5de04
|
Revert "please delete..."
This reverts commit dd5934c81e.
|
2011-10-13 15:45:02 +08:00 |
Matthew Kaito Juyuan Fu
|
dd5934c81e
|
please delete...
|
2011-10-11 17:21:03 +08:00 |
|
chris2tof
|
0ca354cfd0
|
Clean code and new image uploader
|
2011-09-14 15:11:50 +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
|
a1391493a3
|
Revert change in layout/admin.html.erb
|
2011-09-07 14:03:53 +08:00 |
|
chris2tof
|
0956e9784a
|
Fix bug in layout, parser and change lib/fraisier
|
2011-09-07 11:53:16 +08:00 |
|
chris2tof
|
4ce0bda00b
|
Fix links in the menu when in edit or normal render
|
2011-09-05 16:29:44 +08:00 |
|
chris2tof
|
22c9ca4c74
|
Handle "reset.css" and add link in the generated menu
|
2011-09-05 16:06:17 +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
|
f4b1d1e182
|
Modifications in Layout
In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)
|
2011-09-05 01:14:49 +08:00 |
|
chris2tof
|
b2c0047d0f
|
Modification in parse_urls in both layout.rb and theme.rb
|
2011-09-02 19:19:34 +08:00 |
|
chris2tof
|
25355e9c7f
|
Force encoding and stip filename in Theme::parse_urls
|
2011-09-01 19:14:34 +08:00 |
|
chris2tof
|
9101a2921e
|
Modifications for image urls
Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig".
|
2011-09-01 19:08:45 +08:00 |
|
chris2tof
|
f78400c274
|
Clean code
Moved the unzip_design method as protected
|
2011-09-01 19:06:49 +08:00 |
|
chris2tof
|
a570be1811
|
Skip callbacks
|
2011-09-01 18:28:04 +08:00 |
|
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 |