d23cf152da
Merge 'standardization' and 'role structure modification'
2011-12-10 18:21:59 +08:00
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
f774084e9a
Back-end standardization
2011-12-10 18:03:32 +08:00
e0cdedfa2e
Remove useless controller and view
...
user_attributes_controller and user_attributes views
2011-12-06 18:12:12 +08:00
b77282c643
Test redmine service-hook
2011-12-05 19:28:06 +08:00
c0fbb999e7
Modification of Gemfile for linux
2011-12-05 19:19:05 +08:00
4a56e78271
Change .rvmrc
2011-12-05 16:35:48 +08:00
227ca0d43a
Update gems
2011-12-05 16:29:22 +08:00
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
77842ab37d
Remove calendar
2011-12-05 10:44:10 +08:00
26b49dcf02
Remove js from html
2011-12-05 10:36:25 +08:00
962bf03af2
Remove snippet
2011-12-05 10:27:22 +08:00
f3f405c1b4
Remove useless files in items
2011-12-05 09:56:26 +08:00
75a3c4d5b1
Modify assets
...
Each layout has a manifest for css and js
2011-12-05 09:54:41 +08:00
a0ec38ca99
Merge with branch november_presentation
2011-12-01 13:50:49 +08:00
b68f5e11e5
Final modifications for the presentation
2011-11-22 18:54:10 +08:00
1fcacbb4af
Matt's code for NewBlog interface
2011-11-20 12:59:04 +08:00
66bc0ce560
Modified dev.rake
2011-11-20 03:16:35 +08:00
a03e9bada8
Add missing translations
2011-11-20 02:14:51 +08:00
c9137737e3
Resolve conflicts
2011-11-20 01:35:28 +08:00
e99affbddd
Merge with Matt's code
2011-11-20 01:26:24 +08:00
e4dc5bd107
App block is working with full design now
2011-11-20 00:03:02 +08:00
2754f49fe9
Missing code in parser for displaying image in the fornt-end
2011-11-19 23:11:49 +08:00
ad9f9bbf5c
Final Ray's modifications
2011-11-19 21:47:18 +08:00
dac6348402
Integration of module_app workflow
2011-11-19 14:33:26 +08:00
65349796d0
Ray's modifications
2011-11-18 16:43:14 +08:00
e594242dba
Revert "Update NewBlog package with screenshots"
...
This reverts commit bcd5564c31
2011-11-18 10:27:25 +08:00
bcd5564c31
Update NewBlog package with screenshots
2011-11-18 09:56:20 +08:00
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
c4810274ec
Rescue nil values for attribute_values in User
2011-11-16 18:41:09 +08:00
bcf487f264
Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation
2011-11-16 18:37:29 +08:00
0556dc9297
ika's modification to the backend
2011-11-16 18:34:54 +08:00
5c3ae104f0
Add log info for asking restart after app module installed
2011-11-16 17:01:44 +08:00
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
c1d77fa6d6
Changes for purchases - handle different type of purchases
2011-11-14 10:22:31 +08:00
d9d7099da6
Fix bug: users can now be saved
2011-11-12 17:54:45 +08:00
0a6efeb0a2
put dymanic loading related kernel code and query kernel code into public/static
...
put dymanic loading related kernel code and query kernel code into
public/static.
everything in JS need be loaded at frontend from ruling com should be
placed here.
2011-10-21 14:11:41 +08:00
a0f1220b63
changed filename for complete asset pipeline
2011-10-21 10:38:51 +08:00
d47db8e395
Remove production.css
2011-10-20 17:19:35 +08:00
0e252cf93c
APP fronted showing
2011-10-20 15:29:54 +08:00
cb07a35cc9
Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD
2011-10-20 10:06:06 +08:00
ff82391b7d
Revert "Merge with new_blog"
...
This reverts commit 64c68fcdeb
2011-10-20 10:01:39 +08:00
64c68fcdeb
Merge with new_blog
2011-10-18 11:36:01 +08:00
2e86d8081f
Modifications for images in html code
2011-10-18 11:21:24 +08:00
b9fdf5de04
Revert "please delete..."
...
This reverts commit dd5934c81e
2011-10-13 15:45:02 +08:00
dd5934c81e
please delete...
2011-10-11 17:21:03 +08:00
0ca354cfd0
Clean code and new image uploader
2011-09-14 15:11:50 +08:00
f2e3cb00db
Fix bug when editing a page, the theme wasn't including blank
2011-09-13 14:03:03 +08:00
4db88282a1
Modification in Design structure_css -> default_css
2011-09-13 11:57:20 +08:00
07ccacb7d7
Modifications of the JS in Design
2011-09-09 15:40:13 +08:00
chris2tof
Christophe Vilayphiou
Matthew Fu