Romain Neutron f955163edb Merge branch '3.7' into 3.8 ...

Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc

2013-09-14 02:02:56 +02:00

..

data_templates

[SearchEngine] Fix files mode

2013-01-17 11:43:30 +01:00

Doctrine

Rename UsrAuthProviderRepository

2013-05-29 14:23:26 +02:00

PhraseaFixture

Regenerate doctrine entities and proxies

2013-06-17 20:11:44 +02:00

plugins

Add plugins reset command

2013-08-08 15:35:46 +02:00

_GV_template.inc

Merge branch '3.7' into 3.8

2013-09-14 02:02:56 +02:00

bases_structure.xml

Merge branch '3.7' into 3.8

2013-09-14 02:02:56 +02:00

blank_cterms.xml

Thesaurus refactor

2013-02-28 16:14:33 +01:00

blank_thesaurus.xml

Thesaurus refactor

2013-02-28 16:14:33 +01:00

configuration.yml

Fix #1243 Phraseanet enabled languages is now configurable

2013-07-17 21:22:01 +02:00

minifyGroupsConfig.php

Fix #1347 : Export dialog box does not open in lightbox

2013-07-17 11:55:34 +02:00

plugin-schema.json

Add customized twig path, plugins twig namespace

2013-07-02 22:50:03 +02:00