Nicolas Le Goff 46da7be65d Merge branch '3.8' ...

Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php

2014-08-19 15:30:25 +02:00

..

ACL

Delete references to usr.usr_id field in entities

2014-02-19 17:29:25 +01:00

Application

Fix install

2014-08-19 15:00:36 +02:00

Authentication

PHP CS fix

2014-05-30 15:22:00 +02:00

Border

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

Cache

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02:00

Command

Merge branch '3.8'

2014-08-19 15:30:25 +02:00

Controller

Fix latest merge

2014-08-19 14:59:48 +02:00

Core

Fix install

2014-08-19 15:00:36 +02:00

Exception

Merge branch '3.8'

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

Feed

Fix feeds aggregation restrictions

2014-03-31 11:23:35 +02:00

Form

Fix latest merge

2014-08-13 17:40:40 +02:00

Helper

Fix PDF generation for print

2014-08-19 11:43:16 +02:00

Http

PHP CS fix

2014-05-30 15:22:00 +02:00

Media

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

Metadata

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

Model

Fix CS

2014-07-17 15:17:04 +02:00

Notification

PHP CS fix

2014-05-30 15:22:00 +02:00

Out

Fix PDF generation for print

2014-08-19 11:43:16 +02:00

Plugin

Fix Cs

2014-02-25 16:33:43 +01:00

SearchEngine

Fix latest merge

2014-08-13 17:40:40 +02:00

Security

Fix CS

2014-07-17 15:17:04 +02:00

Setup

Fix migration

2014-06-24 01:03:51 +02:00

TaskManager

Fix CS

2014-07-17 15:17:04 +02:00

Twig

Fix CS

2014-07-17 15:17:04 +02:00

Utilities

Merge branch '3.8'

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

Vocabulary

Add user repository as a service

2014-02-28 19:58:12 +01:00

Webhook

Fix CS

2014-07-17 15:17:04 +02:00

Websocket

Use short array notations

2014-02-19 17:28:39 +01:00

Application.php

Merge branch '3.8'

2014-08-19 15:30:25 +02:00

CLI.php

Reduce connection overhead

2014-03-03 15:10:39 +01:00