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
|
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
|
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 |
|
Kaito
|
6903dc3037
|
adding modified design.rb for sloving dup prob
|
2011-07-22 11:10:14 +08:00 |
|
chris2tof
|
9898bd9df7
|
Modification in JS to upload more than 2 files
|
2011-07-21 11:22:31 +08:00 |
Matthew Fu
|
f8d1a1315b
|
fixing duplicate when updating design
|
2011-07-20 17:05:28 +08:00 |
|
Matthew Fu
|
e3a50ccf69
|
move design file field to partial
|
2011-07-20 14:04:16 +08:00 |
|
Matthew Fu
|
612ed629bc
|
fix design upload
|
2011-07-20 09:58:24 +08:00 |
|
Matthew Fu
|
c48a11d9f5
|
Add some JS for design uploading
|
2011-07-19 18:31:53 +08:00 |
|
chris2tof
|
c3ada90365
|
CarrierWave workaround: the files have to be saved manually
|
2011-07-14 08:48:42 +08:00 |
|
Matthew Fu
|
f73f09ffcf
|
adding files not commited from previous commit
|
2011-07-12 16:02:41 +08:00 |
|
Matthew Fu
|
f387139ae1
|
rails 3.1 and designs (with bug)
|
2011-07-12 16:00:57 +08:00 |
|
chris2tof
|
96a43f023e
|
Edit code (HTML response)
|
2011-06-10 15:02:34 +08:00 |
|
chris2tof
|
a695b9ad29
|
Items UI changes
|
2011-06-10 13:57:42 +08:00 |
|
chris2tof
|
247b8ec4dc
|
HTML code can be modify (paser: update)
|
2011-06-10 10:31:50 +08:00 |
|
chris2tof
|
dda4b30d67
|
Set editable parts
|
2011-06-01 15:49:55 +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
|
2522cde2f5
|
Edition of page part for multiple languages.
|
2011-05-27 11:27:54 +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
|
3d97c5bfda
|
Modification of the page model
|
2011-05-18 10:00:00 +08:00 |
|
chris2tof
|
4399804e19
|
Delete link handle JavaScript disabled
|
2011-05-13 09:59:29 +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
|
2e632f1596
|
#request_uri is deprecated.
|
2011-05-02 13:28:38 +08:00 |
|
chris2tof
|
43d87ecf98
|
Destroy user_attributes and attribute_values when a user is destroyed
|
2011-05-02 13:23:39 +08:00 |
|
chris2tof
|
83bbd77d96
|
Built-in user_attribute_models
|
2011-05-02 12:07:31 +08:00 |
|
chris2tof
|
509c106b3e
|
Modifications of the user model
|
2011-04-28 22:47:34 +08:00 |
|
chris2tof
|
1909edbe2a
|
Simplification of the 'link_back' code
|
2011-04-19 15:05:48 +08:00 |
ihower
|
8a4cffae8f
|
Remove files which should be deleted in previous commit
|
2011-04-13 18:53:47 +08:00 |
chris
|
0067ac48a5
|
include Mongoid::Timestamps
|
2011-04-13 18:22:52 +08:00 |
|
chris
|
fa81b04eee
|
fix bug: quotes in html tags
|
2011-04-13 18:22:52 +08:00 |
|
chris
|
25752b7065
|
tags: image and css - show ID in assets/index
|
2011-04-13 18:22:52 +08:00 |
|
chris
|
5151449bc9
|
radius parser for multilingual - dev.rake
|
2011-04-13 18:22:51 +08:00 |
|
chris
|
fc98757772
|
base layout on id instead of name
|
2011-04-13 18:22:51 +08:00 |
|
chris
|
8b8eff6920
|
replace Liquid by Radius
|
2011-04-13 18:22:51 +08:00 |
|
chris
|
4b4cdbfd31
|
admin status change
|
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
|
a06aa15721
|
add files
|
2011-04-13 18:22:50 +08:00 |
|
chris
|
2ccc2c9b39
|
add user_info
|
2011-04-13 18:22:50 +08:00 |
|
chris
|
73b75ec0b6
|
rescue [] user.active_attributes when nil
|
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 |
rulingcom
|
d28a71f5bf
|
remove .empty? which shouldn't be here
|
2011-04-13 18:22:49 +08:00 |
|
rulingcom
|
c44b86f284
|
fix bugs for i18n_variable in page and home
|
2011-04-13 18:22:49 +08:00 |
chris
|
bda67684bd
|
mongoid rc_6 & fix bugs
|
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 |
|
Wen-Tien Chang
|
554aa0a95d
|
Support i18n and select options user attributes, but admin edit is broken
|
2010-03-18 17:57:26 +08:00 |
|
Wen-Tien Chang
|
bebc51e8bb
|
Admin can new/edit user_attributes
|
2010-03-15 17:35:01 +08:00 |
|
Wen-Tien Chang
|
263da6aa9f
|
Let admin can choose user attributes checkbox
|
2010-03-15 16:13:26 +08:00 |
|
Wen-Tien Chang
|
a40b117fbe
|
add rough user attributes API
|
2010-03-08 17:14:59 +08:00 |
|
Wen-Tien Chang
|
29ee4585b2
|
upgrade to rails3, but grip is broken
|
2010-03-08 16:04:05 +08:00 |
|
Wen-Tien Chang
|
9f1de1b543
|
Add UserAttribute model, suppose it will store user model want to use which attribute group
|
2010-03-04 17:11:18 +08:00 |
|
Wen-Tien Chang
|
13065aa85a
|
Add devise gem and panel/users controller
|
2010-03-04 16:33:26 +08:00 |
|
Wen-Tien Chang
|
e87b3c1d61
|
upgrade to mongo_mapper 0.7.0
|
2010-03-01 16:18:28 +08:00 |
|
Wen-Tien Chang
|
bd46cb1b12
|
remove component link
|
2010-02-22 17:10:08 +08:00 |