Romain Neutron 432252f5f8 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig

2013-11-12 19:19:13 +01:00

..

account

Merge branch '3.8'

2013-11-12 19:19:13 +01:00

admin

Merge branch '3.8'

2013-11-12 19:19:13 +01:00

api/auth

Fix assets path

2013-08-17 17:12:57 +02:00

client

Use ACL service provider to get user's ACL

2013-11-05 12:21:42 +01:00

common

Use ACL service provider to get user's ACL

2013-11-05 12:21:42 +01:00

developers

Login page geonames plugin integration

2013-07-03 18:34:34 +02:00

geonames

Update templates filepaths

2012-07-24 13:12:25 +02:00

lightbox

Fix tests

2013-11-05 15:33:01 +01:00

login

Merge branch '3.8'

2013-10-31 13:57:21 +01:00

prod

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

report

Merge branch '3.8'

2013-10-15 19:11:39 +02:00

setup

Merge branch '3.8'

2013-11-05 15:20:35 +01:00

thesaurus

Fix assets path

2013-08-17 17:12:57 +02:00

email-template.html.twig

Fix #1486 : Add 3 missing locales

2013-09-25 10:59:22 +02:00

overview.html.twig

Add swfobject

2013-08-17 17:12:58 +02:00