Nicolas Le Goff 3b9b5a3240 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php

2014-02-05 15:25:52 +01:00

..

ACL

Bump copyright year

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

Application

Merge branch '3.8'

2014-02-04 11:25:59 +01:00

Authentication

Fix CS

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

Border

Fix CS

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

Cache

Fix CS

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

Command

Fix lastest merge

2014-02-05 11:25:41 +01:00

Controller

Fix latest merge

2014-02-04 20:41:22 +01:00

Core

Merge branch '3.8'

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

Exception

Merge branch '3.8'

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

Feed

Fix CS

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

Form

Fix CS

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

Helper

Merge branch '3.8'

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

Http

Fix CS

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

Media

Add subdef substituer

2014-01-14 15:05:44 +01:00

Metadata

Bump copyright year

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

Model

Add elastic-search engine support

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

Notification

Fix CS

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

Out

Merge branch '3.8'

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

Plugin

Fix lastest merge

2014-02-05 11:25:41 +01:00

SearchEngine

Merge branch '3.8'

2014-02-05 15:25:52 +01:00

Security

Merge branch '3.8'

2014-02-04 11:30:23 +01:00

Setup

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

TaskManager

Merge branch '3.8'

2014-02-03 19:13:45 +01:00

Twig

Bump copyright year

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

Utilities

Merge branch '3.8'

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

Vocabulary

Merge branch '3.8'

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

Application.php

Merge branch '3.8'

2014-02-04 11:25:59 +01:00

CLI.php

Merge branch '3.8'

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