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 |
|
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 |