Benoît Burnichon c63f8d777f Merge branch '4.0' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/ControllerProvider/Api/V2.php

2016-02-23 16:27:04 +01:00

..

API

Set OAuth2_Adapter default API version

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

Bridge

Bridge_Api class should not depend on SQL time

2016-02-15 13:53:56 +01:00

cache

bump copyright year

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

caption

Merge pull request #1613 from jygaulier/PHRAS-888_N+1-GetCaption

2016-01-07 14:08:13 +01:00

connection

bump copyright year

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

databox

Merge branch '4.0'

2016-02-17 19:53:48 +01:00

eventsmanager

PHPCS

2016-02-10 19:38:30 +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

media_subdef could sometimes be constructed without a proper URL

2016-02-05 15:36:19 +01:00

module

Missing inclusion of plugin autoloader file

2016-02-17 11:21:52 +01:00

patch

rename is_downloable to isDownloable

2016-02-10 16:01:24 +01:00

patchthesaurus

bump copyright year

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

record

Merge branch '4.0'

2016-02-23 16:27:04 +01:00

recordutils

Add typehints and reduce code duplication

2016-01-26 14:25:08 +01:00

Session

bump copyright year

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

set

Remove use of gettext shortcut method.

2016-02-01 14:03:29 +01: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

bump copyright year

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

ACL.php

Getting collection calls access_restriction which is not properly cached.

2016-01-27 18:55:49 +01:00

appbox.php

Getting collection calls access_restriction which is not properly cached.

2016-01-27 18:55:49 +01: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

Getting collection calls access_restriction which is not properly cached.

2016-01-27 18:55:49 +01:00

DailymotionWithoutOauth2.php

Merge branch '3.8'

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

databox.php

PHPCS Fixes some unused class imports

2016-02-12 17:29:21 +01:00

ftpclient.php

PHRAS-771 #time 2h

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

p4field.php

Merge remote-tracking branch 'upstream/3.8'

2015-02-23 19:16:56 +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

queries.php

bump copyright year

2016-01-05 13:38:14 +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

bump copyright year

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