Christophe Vilayphiou db410b9c50 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-05-18 19:44:18 +08:00

..

assets

Changes for dat and time format

2012-05-18 19:42:36 +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

Changes for dat and time format

2012-05-18 19:42:36 +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

Changes for dat and time format

2012-05-18 19:42:36 +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