Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap ...

Conflicts:
	config/environments/development.rb

2012-05-09 13:51:00 +08:00

..

assets

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +08:00

controllers

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +08:00

helpers

Dashboard partial implementation

2012-05-09 05:53:07 +08:00

jobs

Patch from ldap: Test version for DB sync schedule job

2012-05-08 21:14:57 +08:00

mailer

Add mail_settings

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

models

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +08:00

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +08:00