Romain Neutron ecf516406a Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php

2013-12-19 10:31:52 +01:00

..

Admin

Merge branch '3.8'

2013-12-19 10:31:52 +01:00

Api

Use symfony translator

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

Client

Locale simplification

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

Prod

Merge branch '3.8'

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

Report

Fix unit tests and arrays declaration

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

Root

Add fixtures to sqlite db

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

Thesaurus

Fix unit tests and arrays declaration

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

User

Use symfony translator

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

Utils

Remove license comments

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

AbstractDelivery.php

Merge branch '3.8'

2013-12-02 18:17:38 +01:00

Datafiles.php

Remove license comments

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

Exception.php

Remove license comments

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

Lightbox.php

Use symfony translator

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

Minifier.php

Use short array declaration

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

Permalink.php

Remove license comments

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

RecordsRequest.php

Use short array declaration

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

Setup.php

Fix unit tests and arrays declaration

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