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
..
assets	fix ad_banner. new ad_image with best size from ad_banner. content editable at tab	2012-05-17 23:35:46 +08:00
controllers	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
helpers	Change impression count to exclude when :referrer is nil	2012-05-18 14:13:11 +08:00
jobs	Restart job	2012-05-14 00:50:36 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Asset changes, add description	2012-05-17 18:31:40 +08:00
uploaders	Comment out filename in FIleAssetUploader	2012-05-17 23:34:15 +08:00
views	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team	2012-05-18 18:50:10 +08:00