Nicolas Le Goff 15abccf594 Merge branch '3.8' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php

2014-01-20 11:08:36 +01:00

..

collection

Merge branch '3.8'

2014-01-20 11:08:36 +01:00

common

Locale simplification

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

databox

Fix phpunit test suite

2014-01-14 14:54:28 +01:00

fields

Fix twig tags

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

publications

Add fixtures to sqlite db

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

search-engine

Fix twig tags

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

statusbit

Locale simplification

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

task-manager

Locale simplification

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

user

Merge branch '3.8'

2014-01-20 11:08:36 +01:00

connected-users.html.twig

Locale simplification

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

dashboard.html.twig

Update templates to fit the new translator

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

databases.html.twig

Use symfony translator

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

editusers_masks.html.twig

Locale simplification

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

editusers_quotas.html.twig

Locale simplification

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

editusers_timelimit_sbas.html.twig

Update templates to fit the new translator

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

editusers_timelimit.html.twig

Locale simplification

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

editusers.html.twig

Locale simplification

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

index.html.twig

Remove phraseanet registry

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

setup.html.twig

Remove phraseanet registry

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

statusbit.html.twig

Locale simplification

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

structure.html.twig

Fix twig tags

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

subdefs.html.twig

Locale simplification

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

tree.html.twig

Remove phraseanet registry

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

users.html.twig

Use symfony translator

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