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

..

API

Set OAuth2_Adapter default API version

2016-02-16 13:48:35 +01:00

Bridge

Backport PHP7 issue fix in Youtube Bridge

2016-05-19 14:08:48 +02:00

cache

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

caption

Merge pull request #1831 from bburnichon/improvement/search

2016-05-23 14:17:25 +02:00

connection

bump copyright year

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

databox

PHRAS-1177_change-multi-on-field

2016-06-27 16:45:51 +02:00

eventsmanager

PHRAS-1038 - fix story navigation in workzone context

2016-03-22 17:17:01 +01:00

Exception

bump copyright year

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

http

bump copyright year

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

media

str_replace / by _ in labels of permalinks

2016-05-20 17:19:46 +02:00

module

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

patch

fix syntax error text_mail_receiver

2016-09-16 19:21:27 +02:00

patchthesaurus

bump copyright year

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

record

PHRAS-1248 Merge branch '4.0'

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

recordutils

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

Session

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

set

Fix duplicated extensions

2016-06-14 09:36:49 +02:00

Setup

bump copyright year

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

thesaurus

bump copyright year

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

User

Avoid N+1 in User_Query

2016-03-22 15:55:53 +01:00

ACL.php

PHRAS-573 Add status rights in /me response

2016-05-25 14:08:34 +02:00

appbox.php

Allow removing order masters without adding a new one

2016-07-29 14:46:18 +02:00

base.php

Remove useless function argument apply_patches

2016-01-22 12:23:18 +01:00

Browser.php

Use short array declaration

2013-11-18 13:57:33 +01:00

collection.php

Fix watermark getter

2016-03-23 18:02:48 +01:00

DailymotionWithoutOauth2.php

Merge branch '3.8'

2014-02-28 19:37:54 +01:00

databox.php

PHRAS-1177_change-multi-on-field

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

ftpclient.php

PHRAS-771 #time 2h

2015-10-15 17:02:04 +02:00

p4field.php

Add orderable status in admin forms

2016-02-24 17:23:06 +01:00

p4string.php

Remove unused functions

2014-03-05 02:45:10 +01:00

patchAbstract.php

Proper renaming of migrations to comply with doctrine migration convention

2015-03-26 09:57:18 +01:00

patchInterface.php

Bump copyright year

2014-01-06 15:40:56 +01:00

phrasea.php

Add array type check on cache returned value

2016-01-22 12:23:18 +01:00

phraseadate.php

Bump copyright year

2014-01-06 15:40:56 +01:00

random.php

bump copyright year

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

setup.php

bump copyright year

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

thesaurus.php

Bump copyright year

2014-01-06 15:40:56 +01:00

unicode.php

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00