Christophe Vilayphiou 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/views/layouts/_side_bar.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb		2012-03-16 14:55:21 +08:00
..
assets	fix dashboard & announcement	2012-03-16 14:44:57 +08:00
controllers	Change Obit to Orbit	2012-03-16 11:54:31 +08:00
helpers	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00
models	change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.	2012-02-29 18:58:33 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-03-16 14:55:21 +08:00