Christophe Vilayphiou 65a0998080 Merge branch 'jobs_and_mail' into ldap ... Conflicts: config/environments/development.rb config/routes.rb		2012-05-08 11:45:34 +08:00
..
assets	Merge branch 'design_team' into ldap	2012-05-08 11:40:38 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-08 11:40:38 +08:00
helpers	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-07 16:08:05 +08:00
jobs	God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.	2012-05-08 11:41:58 +08:00
mailer	starting Resque	2012-05-08 11:41:58 +08:00
models	Merge branch 'design_team' into ldap	2012-05-08 11:40:38 +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-08 11:40:38 +08:00