unknown
|
9f93af100b
|
merge with master
|
2012-01-11 20:14:28 +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 |
|
chris2tof
|
75a3c4d5b1
|
Modify assets
Each layout has a manifest for css and js
|
2011-12-05 09:54:41 +08:00 |
|
chris2tof
|
a03e9bada8
|
Add missing translations
|
2011-11-20 02:14:51 +08:00 |
|
chris2tof
|
861237d65b
|
Integration of Ray' modifications
|
2011-11-17 20:02:58 +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 |
|
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
|
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
|
a570be1811
|
Skip callbacks
|
2011-09-01 18:28:04 +08:00 |
|
chris2tof
|
f99321c279
|
production mode
|
2011-08-25 15:59:20 +08:00 |
|
chris2tof
|
c427e2af14
|
Page form with drop down. Modifications for Designs
|
2011-08-25 08:13:38 +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
|
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
|
e74f2931b1
|
Modifications asset pipeline
|
2011-08-20 22:54:07 +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
|
b6db304579
|
add nokogiri into Gemfile and fixing dup bug again...
|
2011-07-29 17:49:10 +08:00 |
|
Kaito
|
9eb80d7424
|
Made r_editor into class style add functions
|
2011-07-27 17:23:01 +08:00 |
|
Kaito
|
a272b871e2
|
complete del and destroy funciton for desgin
|
2011-07-22 15:54:38 +08:00 |
Matthew Fu
|
c48a11d9f5
|
Add some JS for design uploading
|
2011-07-19 18:31:53 +08:00 |
|
Matthew Fu
|
f387139ae1
|
rails 3.1 and designs (with bug)
|
2011-07-12 16:00:57 +08:00 |
unknown
|
7215b56f7e
|
changes for windows
|
2011-06-14 15:04:37 +08:00 |
|
chris2tof
|
7b5ea870a0
|
Delete page.
|
2011-06-01 12:00:41 +08:00 |
|
chris2tof
|
ddc7c74436
|
Create page.
|
2011-06-01 10:24:14 +08:00 |
|
chris2tof
|
0969f6b6cc
|
CKEditor.
The error came from some script in Application.js
|
2011-05-26 13:48:09 +08:00 |
|
chris2tof
|
964440fa86
|
Remove CKEditor due to conflicts with the jQuery library
|
2011-05-26 11:23:46 +08:00 |
|
chris2tof
|
a8c4e17c56
|
CKEditor.
Edition of page part for single language.
|
2011-05-25 16:27:17 +08:00 |
|
chris2tof
|
d971a8ecbe
|
Uniformized: @page and @ link in @item
Change parser for page edition.
|
2011-05-25 14:50:56 +08:00 |
|
chris2tof
|
24ae7ed5e3
|
Links edition
|
2011-05-13 09:08:42 +08:00 |
|
chris2tof
|
d9ba76ebd5
|
- No more Home object
- Sitemap on the left side and view of the current page in the main block
|
2011-05-09 18:49:57 +08:00 |
|
chris2tof
|
9fdfb140d3
|
Not needed in Rails 3
|
2011-05-02 15:59:02 +08:00 |
|
chris2tof
|
d88cae437d
|
update gem bson_ext and devise initializer
|
2011-04-14 13:40:16 +08:00 |
ihower
|
8a4cffae8f
|
Remove files which should be deleted in previous commit
|
2011-04-13 18:53:47 +08:00 |
|
chris
|
6db9727829
|
revert to mongoid 2.0.0 and remove reroute_middleware
|
2011-04-13 18:29:33 +08:00 |
|
chris
|
106db069fd
|
update radius, modify routes to handle modules, add blog module
|
2011-04-13 18:28:24 +08:00 |
|
chris
|
25752b7065
|
tags: image and css - show ID in assets/index
|
2011-04-13 18:22:52 +08:00 |
|
chris
|
70347d4c34
|
add missing file
|
2011-04-13 18:22:51 +08:00 |
|
chris
|
4b4cdbfd31
|
admin status change
|
2011-04-13 18:22:50 +08:00 |
|
chris
|
e360baadde
|
delete /initializers/mongoid.rb
|
2011-04-13 18:22:50 +08:00 |
|
chris
|
e62df90117
|
user can't delete self and flash_messages
|
2011-04-13 18:22:50 +08:00 |
|
chris
|
318c264cae
|
add user_info
|
2011-04-13 18:22:50 +08:00 |
|
chris
|
27bdbadf08
|
404 for pages and asset column error
|
2011-04-13 18:22:49 +08:00 |
|
ihower
|
19a7d51e60
|
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
|
2011-04-13 18:19:51 +08:00 |