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 |
|
Thibaud Fabre
|
303a39e359
|
Allow removing order masters without adding a new one
|
2016-07-29 14:46:18 +02:00 |
|
Jean-Yves Gaulier
|
9e891d4ae9
|
PHRAS-1164_Backport-PHRAS-1158-to-4.0
#time 20m
|
2016-06-16 16:02:26 +02:00 |
|
Jean-Yves Gaulier
|
51ff2e040a
|
PHRAS-1158_STAMP-CHANGE-COLL
fix : the stamp was not updated when a record changed of collection
#time 2h
|
2016-06-16 13:54:45 +02:00 |
|
Benoît Burnichon
|
0d6c44fac3
|
Add some missing copyrights
|
2016-03-22 15:54:32 +01:00 |
|
Benoît Burnichon
|
8044a1ce40
|
Add some missing copyrights
|
2016-03-02 14:34:50 +01:00 |
|
Thibaud Fabre
|
232b72269a
|
Fix call on non object
|
2015-07-10 19:04:54 +02:00 |
|
Thibaud Fabre
|
d8f498aa26
|
Improve collection reference caching and remove legacy maps
|
2015-07-10 18:39:36 +02:00 |
|
Aztech
|
616f57e8ed
|
WIP Extract collection service
|
2015-07-10 10:09:35 +02:00 |
|