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

..

Field

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

cgu.php

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

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

descriptionStructure.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

field.php

Add reconnectable connection

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

status.php

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02:00

subdef.php

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

subdefsStructure.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00