Matthew K. Fu JuYuan 661fcafe70 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb		2012-05-18 18:50:10 +08:00
..
admin	fix view for different_user for ad_banner. add field 'best size' for ad_banner within form	2012-05-18 14:19:13 +08:00
devise	Change for the notice msg at login page	2012-04-30 00:24:10 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
layouts	fix news approve and preview	2012-05-18 18:47:18 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00