orbit-basic/app/views
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
..
admin 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
devise Remove class 'error' in devise forms 2012-02-29 04:56:32 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Announcement modifications and tags 2012-02-15 00:34:22 +08:00
layouts Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard 2012-03-16 14:55:21 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00