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

..

Collection.php

Use ACL service provider to get user's ACL

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

ConnectedUsers.php

Merge branch '3.8'

2013-10-31 14:01:44 +01:00

Dashboard.php

Add ACL Manipulator

2013-11-08 17:51:14 +01:00

Databox.php

Use ACL service provider to get user's ACL

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

Databoxes.php

Use ACL service provider to get user's ACL

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

Fields.php

Fix CS

2013-10-31 11:53:30 +01:00

Publications.php

Use ACL service provider to get user's ACL

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

Root.php

Use ACL service provider to get user's ACL

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

SearchEngine.php

Remove deprecated comments in admin controllers

2013-10-30 18:30:44 +01:00

Setup.php

Merge branch '3.8'

2013-10-31 14:01:44 +01:00

Subdefs.php

Merge branch '3.8'

2013-10-31 14:01:44 +01:00

TaskManager.php

Insight recommendations

2013-11-12 17:58:03 +01:00

Users.php

Merge branch '3.8'

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