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
|
b77282c643
|
Test redmine service-hook
|
2011-12-05 19:28:06 +08:00 |
|
chris2tof
|
69a8fce64a
|
Fix double loading bug
On an html load, the page was reload by the js "popstate"
|
2011-12-05 11:22:32 +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
|
66bc0ce560
|
Modified dev.rake
|
2011-11-20 03:16:35 +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
|
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
|
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
|
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
|
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
|
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 |