Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap

2012-05-23 12:11:38 +08:00

..

assets

Merge branch 'design_team' into ldap

2012-05-23 12:11:38 +08:00

controllers

Merge branch 'design_team' into ldap

2012-05-23 12:11:38 +08:00

helpers

Remove seconds from date display

2012-05-22 20:19:04 +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-22 20:33:07 +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-22 20:33:07 +08:00