Nicolas Le Goff 28eecf6a09 Merge branch '3.8' ...

Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup

2014-10-09 19:40:33 +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

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

2014-09-05 15:57:00 +02: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

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

2014-09-05 15:57:00 +02: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

Fix latest merge

2014-08-13 17:40:40 +02:00

386alpha2a.php

Fix patch migration

2014-09-02 18:17:00 +02:00

386alpha3a.php

Fix patch migration

2014-09-30 16:58:35 +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

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

2014-09-05 15:57:00 +02: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

390alpha19a.php

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

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

390alpha20a.php

Bump to version 390-alpha20

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

3715alpha1a.php

Fix CS

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