Romain Neutron 1713c23c59 Merge branch '3.8' ...

Conflicts:
	bin/console
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/User/Adapter.php
	lib/classes/media/Permalink/Adapter.php
	lib/classes/media/abstract.php
	lib/classes/media/subdef.php
	lib/classes/p4file.php
	lib/classes/record/preview.php
	lib/conf.d/_GV_template.inc
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
	tests/classes/media/Permalink/media_Permalink_AdapterTest.php

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

..

320alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

320alpha1b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

320alpha2a.php

Substitute random string generator by Randomlib

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

320alpha3a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

320alpha4a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

320alpha4b.php

Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users

2014-02-20 18:02:27 +01:00

320alpha5a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

320alpha6a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

320alpha8a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

360alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

360alpha1b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

360alpha2a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

360alpha2b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

361alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

370alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

370alpha3a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

370alpha4a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

370alpha5a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

370alpha6a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

370alpha7a.php

Merge branch '3.8'

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

370alpha8a.php

Merge branch '3.8'

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

370alpha9a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

371alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

373alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

379alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha2a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha2b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha3a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha3b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha4a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha6a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha8a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha9a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha10a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha11a.php

Use Doctrine DBAL instead of custom connection

2014-02-22 23:55:12 +01:00

380alpha13a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha14a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha15a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha16a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha17a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

380alpha18a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

381alpha1b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

381alpha2a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

381alpha3a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

381alpha4a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

383alpha1a.php

Fix unit tests

2014-03-01 14:37:56 +01:00

383alpha2a.php

Avoid using getPartialReference

2014-02-20 16:14:01 +01:00

383alpha3a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

383alpha5a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

384alpha1a.php

Add H264 pseudo streaming tools

2014-02-28 20:18:40 +01:00

390alpha1a.php

Avoid using getPartialReference

2014-02-20 16:14:01 +01:00

390alpha3a.php

Avoid using getPartialReference

2014-02-20 16:14:01 +01:00

390alpha4a.php

Avoid using getPartialReference

2014-02-20 16:14:01 +01:00

390alpha5a.php

Avoid using getPartialReference

2014-02-20 16:14:01 +01:00

390alpha6a.php

Fix configuration usage

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

390alpha7a.php

Avoid using getPartialReference

2014-02-20 16:14:01 +01:00

390alpha8a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

390alpha9a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

390alpha9b.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

390alpha11a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

390alpha12a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00

390alpha13a.php

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

390alpha14a.php

Cleanup API

2014-02-28 00:38:12 +01:00

3715alpha1a.php

Fix patchs inheritance

2014-02-26 10:37:26 +01:00