Romain Neutron 9580ff7585 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig

2013-12-09 14:17:03 +01:00

..

account

Use symfony translator

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

admin

Merge branch '3.8'

2013-12-09 14:17:03 +01:00

api/auth

Fix unit tests and arrays declaration

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

client

Locale simplification

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

common

Fix unit tests and arrays declaration

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

developers

Fix twig tags

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

geonames

Fix twig tags

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

lightbox

Update templates to fit the new translator

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

login

Merge branch '3.8'

2013-12-09 14:17:03 +01:00

prod

Merge branch '3.8'

2013-12-03 21:19:20 +01:00

report

Locale simplification

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

setup

Use symfony translator

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

thesaurus

Locale simplification

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

email-template.html.twig

Use symfony translator

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

overview.html.twig

Add swfobject

2013-08-17 17:12:58 +02:00