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 |
|
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
|
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
|
75a3c4d5b1
|
Modify assets
Each layout has a manifest for css and js
|
2011-12-05 09:54:41 +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
|
ad9f9bbf5c
|
Final Ray's modifications
|
2011-11-19 21:47:18 +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 |
|
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
|
07ccacb7d7
|
Modifications of the JS in Design
|
2011-09-09 15:40:13 +08:00 |
|
chris2tof
|
a571d1dcff
|
Clean code and workaround mongoid embedded with carrierwave
|
2011-09-08 18:12:04 +08:00 |
|
chris2tof
|
0956e9784a
|
Fix bug in layout, parser and change lib/fraisier
|
2011-09-07 11:53:16 +08:00 |
|
chris2tof
|
230842d26a
|
Ika fix bug
|
2011-08-25 15:44:51 +08:00 |
|
chris2tof
|
c248b729db
|
CSS problem for page
|
2011-08-25 15:08:23 +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
|
4cd9854706
|
Ika's changes
|
2011-08-25 08:07:18 +08:00 |
|
chris2tof
|
09cdb9a852
|
CSS modifications for design team
|
2011-08-23 15:59:07 +08:00 |
|
chris2tof
|
4f38074932
|
content.css -> content.css.erb
|
2011-08-23 10:05:16 +08:00 |
|
chris2tof
|
e74f2931b1
|
Modifications asset pipeline
|
2011-08-20 22:54:07 +08:00 |
|
Kaito
|
f6ae58cef4
|
Trying to create Design from upload package
|
2011-08-12 17:47:03 +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 |
|
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 |
|
Matthew Fu
|
f73f09ffcf
|
adding files not commited from previous commit
|
2011-07-12 16:02:41 +08:00 |