Christophe Vilayphiou 5417c6fec0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb		2012-04-12 07:13:13 +08:00
..
assets	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-12 07:13:13 +08:00
controllers	The new AdBanner.	2012-04-02 03:04:38 +08:00
helpers	Filter and delete for bulletins	2012-04-12 06:50:36 +08:00
models	Fix bugs in upload design and missing menu	2012-04-06 17:37:45 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Ray's changes for orbit bar	2012-04-06 18:06:57 +08:00