Matthew Fu
|
7b40706aed
|
fixing for app_auth
|
2012-01-05 16:20:51 +08:00 |
chris2tof
|
7ebfe3a7f9
|
Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug
|
2011-12-29 18:08:08 +08:00 |
|
chris2tof
|
d85f29e65c
|
Fix missing modification for "panel_main" to "back_main"
|
2011-12-29 17:49:48 +08:00 |
|
chris2tof
|
c1238a7043
|
Prefix ids with "back_" in back-end layout to avoid conflict with site's ids
|
2011-12-29 15:35:13 +08:00 |
|
chris2tof
|
ea19f11fe2
|
Integrate Harry's modifications to reload pop-up content
|
2011-12-29 14:09:06 +08:00 |
|
chris2tof
|
b002c411ce
|
Merge branch 'design_team'
|
2011-12-28 21:03:35 +08:00 |
Christophe Vilayphiou
|
75c9851dbc
|
Ray's back-end modifications for sub-roles
|
2011-12-28 20:57:18 +08:00 |
|
chris2tof
|
090493fd51
|
Re-commit
|
2011-12-28 20:51:52 +08:00 |
|
chris2tof
|
245def9cb6
|
Integration of pop-up and generic js.erb
|
2011-12-28 20:49:53 +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 |
|
Matthew Fu
|
d3ca1647be
|
fix page form bugs
|
2011-12-23 13:54:28 +08:00 |
|
chris2tof
|
d465febca7
|
merge with november_presentation
|
2011-12-22 15:43:38 +08:00 |
|
chris2tof
|
e7c9816139
|
Move NewBlog to built_in_modules and delete "vendor/templates"
|
2011-12-22 01:38:27 +08:00 |
|
chris2tof
|
a09f8e4551
|
merge with november_presentation
|
2011-12-20 16:47:17 +08:00 |
|
chris2tof
|
afbffe37d5
|
Users can now be saved with sub_roles
|
2011-12-20 14:35:28 +08:00 |
|
chris2tof
|
4108ebf06d
|
Fix mongoid deeply nested polimorphic
Got the commit from github. The roles and sub_roles save.
|
2011-12-19 21:22:26 +08:00 |
|
chris2tof
|
d27d7a623c
|
Changes for sub_roles
Issues: update doesn't create new i18n_variables, role form has bugs
|
2011-12-18 10:07:42 +08:00 |
|
chris2tof
|
d23cf152da
|
Merge 'standardization' and 'role structure modification'
|
2011-12-10 18:21:59 +08:00 |
|
chris2tof
|
b7ac5478b4
|
Change role structure
Still needs to: change the views and create sub_roles in the dev.rake
|
2011-12-10 18:12:39 +08:00 |
|
Christophe Vilayphiou
|
f774084e9a
|
Back-end standardization
|
2011-12-10 18:03:32 +08:00 |
|
chris2tof
|
e0cdedfa2e
|
Remove useless controller and view
user_attributes_controller and user_attributes views
|
2011-12-06 18:12:12 +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 |
|
chris2tof
|
d9d7099da6
|
Fix bug: users can now be saved
|
2011-11-12 17:54:45 +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
|
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
|
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
|
294e06d630
|
Change "RulingSite" into "Orbit"
|
2011-08-25 17:59:49 +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
|
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
|
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 |
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
|
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
|
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
|
83bbd77d96
|
Built-in user_attribute_models
|
2011-05-02 12:07:31 +08:00 |