Christophe Vilayphiou a4afd5c1d3 Merge branch 'design_team' into ldap

2012-05-18 10:36:32 +08:00

..

assets

Merge branch 'design_team' into ldap

2012-05-17 23:36:24 +08:00

controllers

Merge branch 'design_team' into ldap

2012-05-18 10:36:32 +08:00

helpers

Put back I18n for file_upload

2012-05-17 19:40:30 +08:00

jobs

Nccu calendar and daily job.

2012-05-15 14:03:54 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

Merge branch 'design_team' into ldap

2012-05-17 18:32:06 +08:00

uploaders

Comment out filename in FIleAssetUploader

2012-05-17 23:34:15 +08:00

views

Merge branch 'design_team' into ldap

2012-05-17 23:36:24 +08:00