Nicolas Le Goff bd1e4516bd Merge branch '3.8' ...

Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig

2014-02-03 19:02:22 +01:00

..

API

Merge branch '3.8'

2014-01-27 17:23:03 +01:00

appbox

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Bridge

Fix CS

2014-01-14 12:04:38 +01:00

cache

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

caption

Fix CS

2014-01-30 19:56:05 +01:00

connection

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

databox

Add elastic-search engine support

2014-01-27 20:12:13 +01:00

deprecated

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

eventsmanager

Bump copyright year

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

Exception

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

http

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

media

Add elastic-search engine support

2014-01-27 20:12:13 +01:00

module

Add task manager logs configuration

2014-01-31 15:05:57 +01:00

patch

Merge branch '3.8'

2014-02-03 19:02:22 +01:00

patchthesaurus

Bump copyright year

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

record

Fix CS

2014-01-30 19:56:05 +01:00

recordutils

Decouple caption and its serialization

2014-01-27 20:12:13 +01:00

Session

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

set

Decouple caption and its serialization

2014-01-27 20:12:13 +01:00

Setup

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

system

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

thesaurus

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

User

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

ACL.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

appbox.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

base.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Browser.php

Use short array declaration

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

collection.php

Merge branch '3.8'

2014-01-27 17:23:03 +01:00

connection.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

DailymotionWithoutOauth2.php

Remove license comments

2013-11-20 16:49:29 +01:00

databox.php

Merge branch '3.8'

2014-01-27 17:23:03 +01:00

format.php

Bump copyright year

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

ftpclient.php

Bump copyright year

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

p4field.php

Bump copyright year

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

p4file.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

p4string.php

Bump copyright year

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

patchInterface.php

Bump copyright year

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

phrasea.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

phraseadate.php

Bump copyright year

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

queries.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

random.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

recordutils.php

Bump copyright year

2014-01-06 15:28:12 +01:00

setup.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

thesaurus.php

Bump copyright year

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

unicode.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

uuid.php

Fix CS

2014-01-14 12:04:38 +01:00

ZipArchiveImproved.php

Fix CS

2014-01-14 12:04:38 +01:00