Romain Neutron 09c74afab6 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php

2013-12-18 12:12:58 +01:00

..

API

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

appbox

Remove license comments

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

Bridge

Fix CS

2013-12-03 20:59:47 +01:00

cache

Remove license comments

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

caption

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

connection

Remove license comments

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

databox

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

deprecated

Locale simplification

2013-12-03 20:05:20 +01:00

eventsmanager

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

Exception

Remove license comments

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

http

Remove license comments

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

media

Use symfony translator

2013-12-03 20:02:40 +01:00

module

Fix #1624 : Some report locales might be broken

2013-12-17 19:41:58 +01:00

patch

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

patchthesaurus

Remove commented code

2013-11-20 16:04:20 +01:00

record

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

recordutils

Remove license comments

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

Session

Use configuration property accessor

2013-11-18 18:48:27 +01:00

set

Use symfony translator

2013-12-03 20:02:40 +01:00

Setup

Remove license comments

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

system

Remove license comments

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

thesaurus

Remove license comments

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

User

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

ACL.php

Merge branch '3.8'

2013-12-09 19:13:15 +01:00

appbox.php

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

base.php

Merge branch '3.8'

2013-12-04 14:52:40 +01:00

Browser.php

Use short array declaration

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

collection.php

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

connection.php

Remove license comments

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

DailymotionWithoutOauth2.php

Remove license comments

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

databox.php

Use symfony translator

2013-12-03 20:02:40 +01:00

format.php

Add missing headers

2013-11-20 19:03:55 +01:00

ftpclient.php

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

p4field.php

Add missing headers

2013-11-20 19:03:55 +01:00

p4file.php

Remove dead code

2013-09-04 12:14:50 +02:00

p4string.php

Add missing headers

2013-11-20 19:03:55 +01:00

patchInterface.php

Add missing headers

2013-11-20 19:03:55 +01:00

phrasea.php

Locale simplification

2013-12-03 20:05:20 +01:00

phraseadate.php

Fix unit tests and arrays declaration

2013-12-03 20:06:49 +01:00

queries.php

Use symfony translator

2013-12-03 20:02:40 +01:00

random.php

Use short array declaration

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

recordutils.php

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

registry.php

Remove license comments

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

registryInterface.php

Remove license comments

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

setup.php

Remove license comments

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

thesaurus.php

Add missing headers

2013-11-20 19:03:55 +01:00

unicode.php

Remove license comments

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

uuid.php

Use short array declaration

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

ZipArchiveImproved.php

Fix doc blocks

2013-01-29 18:34:50 +01:00