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

..

adapter.php

PHRAS-1248 Merge branch '4.0'

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

exportElement.php

Merge branch 4.0 into master

2016-05-25 17:21:08 +02:00

orderElement.php

bump copyright year

2016-01-05 13:38:14 +01:00

preview.php

PHRAS-851 - add databox name, collection name and logo to record title in preview

2016-05-23 11:52:35 +02:00