unknown
|
9f93af100b
|
merge with master
|
2012-01-11 20:14:28 +08:00 |
Matthew Fu
|
3d9fd359ed
|
Moving Orbit frontend and widget controller to controllers folder
|
2012-01-10 18:30:08 +08:00 |
|
Matthew Fu
|
cae3daa9c4
|
Change NewBlog to new_blog
|
2012-01-10 18:29:11 +08:00 |
|
Matthew Fu
|
79f778ad8c
|
creating for disabling widgets and frontend
|
2012-01-05 16:21:33 +08:00 |
|
Matthew Fu
|
7b40706aed
|
fixing for app_auth
|
2012-01-05 16:20:51 +08:00 |
chris2tof
|
1dd85d6ff1
|
Forgot to remove ":remote => true" for asset new
|
2011-12-30 02:34:13 +08:00 |
|
chris2tof
|
0edad4f8c0
|
New rss.js from Harry and fix html form for assets
|
2011-12-29 19:45:21 +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
|
b298aef031
|
Delete tmp files
|
2011-12-29 17:41:20 +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
|
a57dd62281
|
Merge branch 'js_pop_up'
|
2011-12-28 20:52:33 +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
|
210a7fde48
|
Delete useless files
|
2011-12-28 15:11:07 +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
|
a9f06b9517
|
Divide parser into sub-parsers
|
2011-12-22 16:23:48 +08:00 |
|
chris2tof
|
1f9197e438
|
Remove NewBlog from plugins
|
2011-12-22 15:53:34 +08:00 |
|
chris2tof
|
d465febca7
|
merge with november_presentation
|
2011-12-22 15:43:38 +08:00 |
|
chris2tof
|
fa27bfc86b
|
Delete residual files from radius
|
2011-12-22 11:30:46 +08:00 |
|
chris2tof
|
708a174345
|
Remove radius from plugins, put it in Gemfile
|
2011-12-22 11:27:37 +08:00 |
|
chris2tof
|
e7c9816139
|
Move NewBlog to built_in_modules and delete "vendor/templates"
|
2011-12-22 01:38:27 +08:00 |
|
chris2tof
|
95c40d2e53
|
Add plugins directories
|
2011-12-22 01:27:26 +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
|
b77282c643
|
Test redmine service-hook
|
2011-12-05 19:28:06 +08:00 |
|
Christophe Vilayphiou
|
c0fbb999e7
|
Modification of Gemfile for linux
|
2011-12-05 19:19:05 +08:00 |
|
chris2tof
|
4a56e78271
|
Change .rvmrc
|
2011-12-05 16:35:48 +08:00 |
|
chris2tof
|
227ca0d43a
|
Update gems
|
2011-12-05 16:29:22 +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
|
77842ab37d
|
Remove calendar
|
2011-12-05 10:44:10 +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
|
1fcacbb4af
|
Matt's code for NewBlog interface
|
2011-11-20 12:59:04 +08:00 |
|
chris2tof
|
66bc0ce560
|
Modified dev.rake
|
2011-11-20 03:16:35 +08:00 |