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

Conflicts:
	app/views/admin/pages/_edit.html.erb
	app/views/admin/pages/_form.html.erb
	lib/parsers/parser_back_end.rb

2012-05-13 23:14:13 +08:00

..

assets

Changes for widgets

2012-05-13 21:55:39 +08:00

controllers

Add custom title to widgets

2012-05-13 22:35:00 +08:00

helpers

Clean the parsers code

2012-05-13 19:32:05 +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

Add custom title to widgets

2012-05-13 22:35:00 +08:00

uploaders

Modifications for images in html code

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

views

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

2012-05-13 23:14:13 +08:00