Orbit/app
Christophe Vilayphiou f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
..
assets Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-03-27 18:37:14 +08:00
controllers Fix before_filter order for object_auth 2012-03-20 14:17:28 +08:00
helpers First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
models Clean the parsers and introduce the metas 2012-03-21 18:30:12 +08:00
uploaders Modifications for images in html code 2011-10-18 11:21:24 +08:00
views Changes for IE9 with html5 2012-03-21 15:51:55 +08:00