Nicolas Le Goff 2899f152fb Merge branch '3.8' into fix-latest-merge ...

Conflicts:
	README.md
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/result.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskrun.php
	lib/classes/set/export.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/configuration.yml
	templates/web/admin/setup.html.twig
	templates/web/admin/tasks/list.html.twig
	templates/web/api/auth/end_user_authorization.html.twig
	templates/web/prod/actions/Feedback/list.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/upload/upload.html.twig
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/api/v1/api_v1_resultTest.php

2014-08-11 20:28:03 +02: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 CS

2014-07-17 15:17:04 +02: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

Fix patches

2014-06-24 00:33:29 +02:00

384alpha2a.php

Fix CS

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

384alpha3a.php

Fix CS

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

384alpha4a.php

Fix CS

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

384alpha5a.php

Fix CS

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

386alpha1a.php

Add 3.8.6 alpha 1 patch

2014-07-28 12:03:19 +02:00

390alpha1a.php

Fix CS

2014-03-23 23:07: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

Fix Feeds Migration

2014-03-14 11:37:12 +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

Check if 'servername' key exists

2014-03-16 02:11:56 +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

Fix rename of api logs table

2014-03-14 11:37:12 +01:00

390alpha15a.php

Fix tokens table migration

2014-03-14 11:37:12 +01:00

390alpha16a.php

Fix edit_preset table migration

2014-03-14 11:37:12 +01:00

390alpha17a.php

Fix CS

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

390alpha18a.php

Fix CS

2014-03-23 23:07:01 +01:00

3715alpha1a.php

Fix CS

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