Nicolas Le Goff 4596bf5d30 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php

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

..

ACL

Add improvements to unit tests

2013-12-20 10:51:35 +01:00

Application

Decouple caption and its serialization

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

Authentication

Fix CS

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

Border

Bump copyright year

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

Cache

Fix CS

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

Command

Merge branch '3.8'

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

Controller

Remove possibility to update phraseanet from admin panel

2014-01-27 19:50:33 +01:00

Core

Merge branch '3.8'

2014-01-31 14:59:53 +01:00

Feed

Add fixtures to sqlite db

2013-12-18 23:34:06 +01:00

Form

Bump copyright year

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

Http

Fix CS

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

Media

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

Metadata

Fix CS

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

Model

Fix CS

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

Notification

Remove phraseanet registry

2013-12-20 16:44:22 +01:00

Plugin

Merge branch '3.8'

2014-01-31 14:59:53 +01:00

SearchEngine

Add elastic-search engine support

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

Security

Fix unit test names

2013-12-10 01:29:02 +01:00

Setup

Remove phraseanet registry

2013-12-20 16:44:22 +01:00

TaskManager

Fix CS

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

Twig

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

Utilities

Bump copyright year

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

Vocabulary

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

ApplicationTest.php

Remove phraseanet registry

2013-12-20 16:44:22 +01:00

CLITest.php

Fix unit test names, property and function visibility

2013-12-10 01:29:02 +01:00

MockArrayConf.php

Session management is now part of Phraseanet configuration

2014-01-13 17:44:47 +01:00