Nicolas Le Goff 9f38823f27 Merge branch '3.8' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php

2014-12-09 13:59:29 +01:00

..

Bridge

Fix unit tests

2014-03-05 15:27:24 +01:00

caption

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

databox

Merge branch '3.8'

2014-03-10 14:00:40 +01:00

Doctrine/Repositories

Fix unit tests

2014-02-20 13:08:56 +01:00

media

Merge branch '3.8'

2014-03-03 17:00:17 +01:00

module/console

Fix PSR-0 file naming

2014-02-14 15:51:09 +01:00

patch

Fix configuration usage

2014-02-22 10:39:07 +01:00

record

Set User_Query object as a service

2014-09-09 21:21:38 +02:00

recordutils

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

report

Merge branch '3.8'

2014-12-09 13:59:29 +01:00

Session

Merge branch '3.8'

2014-03-03 00:05:11 +01:00

ACLTest.php

Add webhook event && fix tests

2014-09-09 21:21:38 +02:00

collectionTest.php

Add reconnectable connection

2014-03-03 01:00:15 +01:00

CsrfTestProvider.php

Fix neutron comments

2013-12-18 20:00:33 +01:00

databoxTest.php

Fix neutron's comment

2014-02-26 12:06:34 +01:00

FeedValidator.inc

Add fixtures to sqlite db

2013-12-18 23:34:06 +01:00

p4stringTest.php

Remove unused functions

2014-03-05 02:45:10 +01:00

PDOMock.php

Fix neutron comments

2013-12-18 20:00:33 +01:00

PhraseanetAuthenticatedTestCase.php

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

PhraseanetAuthenticatedWebTestCase.php

Merge branch '3.8'

2014-03-03 00:05:11 +01:00

PhraseanetPHPUnitListener.php

Fix CS

2014-07-17 15:17:04 +02:00

PhraseanetTestCase.php

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

PhraseanetWebTestCase.php

Fix unit test names

2013-12-10 01:29:02 +01:00

thesaurusTest.php

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

unicodeTest.php

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

unitTestsTest.php

Merge branch '3.8'

2013-12-19 10:31:52 +01:00

userTest.php

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00