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

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

2012-05-22 20:33:07 +08:00

..

fonts

Fix css bugs (opacity=) and changes in sign_in page

2012-04-27 15:27:59 +08:00

images

js for preventing user do stupid things durning ajax

2012-05-22 14:59:54 +08:00

javascripts

JS changes to load drag and drop

2012-05-22 17:37:15 +08:00

stylesheets

Merge branch 'design_team' into ldap

2012-05-22 20:33:07 +08:00