Phraseanet

mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00

Files

Romain Neutron 420df7febd Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
	lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
	lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
	lib/conf.d/Doctrine/Entities.Session.dcm.yml
	lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
	lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php

2013-12-03 21:19:20 +01:00

Subscriber

Locale simplification

2013-12-03 20:05:20 +01:00

ApiLoadEndEvent.php

Fix #1128 : Add API timers logs

2013-03-25 19:55:33 +01:00

ApiLoadStartEvent.php

Fix #1128 : Add API timers logs

2013-03-25 19:55:33 +01:00

ApiOAuth2EndEvent.php

Fix #1128 : Add API timers logs