Thibaud Fabre 73826d535c PHRAS-1248 Merge branch '4.0' ...

Conflicts:
	Makefile
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Collection/CollectionService.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php
	lib/classes/record/adapter.php
	resources/ansible/roles/app/tasks/main.yml
	resources/www/prod/js/jquery.Edit.js
	resources/www/prod/js/jquery.main-prod.js
	resources/www/prod/skins/ui-components/_answers-tools.scss
	templates/web/common/dialog_export.html.twig
	templates/web/prod/thesaurus.js.twig

2016-09-28 19:52:33 +02:00

..

Alchemy/Tests

PHRAS-1177_change-multi-on-field

2016-06-23 20:22:25 +02:00

classes

PHRAS-1177_change-multi-on-field

2016-06-27 14:39:20 +02:00

files

Some fixup for ES instance

2015-03-11 15:22:20 +01:00

fixtures

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

bootstrap.php

Add User Entity

2013-08-23 20:20:24 +02:00

bootstrap.sh

Fix include resolution

2016-06-30 11:57:02 +02:00

dump_container.sh

Add helper script to dump container

2015-12-22 14:25:13 +01:00