chris2tof
a03e9bada8
Add missing translations
2011-11-20 02:14:51 +08:00
chris2tof
c9137737e3
Resolve conflicts
2011-11-20 01:35:28 +08:00
chris2tof
e99affbddd
Merge with Matt's code
2011-11-20 01:26:24 +08:00
Matthew Fu
e4dc5bd107
App block is working with full design now
2011-11-20 00:03:02 +08:00
chris2tof
2754f49fe9
Missing code in parser for displaying image in the fornt-end
2011-11-19 23:11:49 +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
Matthew Fu
e594242dba
Revert "Update NewBlog package with screenshots"
...
This reverts commit bcd5564c31
.
2011-11-18 10:27:25 +08:00
Matthew Fu
bcd5564c31
Update NewBlog package with screenshots
2011-11-18 09:56:20 +08:00
chris2tof
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
chris2tof
c4810274ec
Rescue nil values for attribute_values in User
2011-11-16 18:41:09 +08:00
chris2tof
bcf487f264
Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation
2011-11-16 18:37:29 +08:00
chris2tof
0556dc9297
ika's modification to the backend
2011-11-16 18:34:54 +08:00
Matthew Fu
5c3ae104f0
Add log info for asking restart after app module installed
2011-11-16 17:01:44 +08:00
Matthew Fu
84ebc8306b
APP zip package placed in lib now can be unzip into vendor
...
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
2011-11-16 15:21:31 +08:00
chris2tof
c1d77fa6d6
Changes for purchases - handle different type of purchases
2011-11-14 10:22:31 +08:00
chris2tof
d9d7099da6
Fix bug: users can now be saved
2011-11-12 17:54:45 +08:00
Matthew Kaito Juyuan Fu
0a6efeb0a2
put dymanic loading related kernel code and query kernel code into public/static
...
put dymanic loading related kernel code and query kernel code into
public/static.
everything in JS need be loaded at frontend from ruling com should be
placed here.
2011-10-21 14:11:41 +08:00
Matthew Kaito Juyuan Fu
a0f1220b63
changed filename for complete asset pipeline
2011-10-21 10:38:51 +08:00
Matthew Kaito Juyuan Fu
d47db8e395
Remove production.css
2011-10-20 17:19:35 +08:00
Matthew Kaito Juyuan Fu
0e252cf93c
APP fronted showing
2011-10-20 15:29: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
2e86d8081f
Modifications for images in html code
2011-10-18 11:21:24 +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