Matthew K. Fu JuYuan 1d9fc7eb75 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509		2012-05-18 10:52:16 +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	Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-18 10:52:16 +08:00
helpers	Put back I18n for file_upload	2012-05-17 19:40:30 +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 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-18 10:52:16 +08:00