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

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

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

..

account

Remove phraseanet registry

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

admin

Merge pull request #869 from romainneutron/elastic-search

2014-01-28 02:09:04 -08:00

api/auth

Remove phraseanet registry

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

client

Merge branch '3.8'

2014-02-04 11:25:59 +01:00

common

Merge branch '3.8'

2014-01-23 08:23:47 +01:00

developers

Remove phraseanet registry

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

geonames

Fix twig tags

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

lightbox

Make search engine a real service

2014-01-07 16:45:58 +01:00

login

Add fixtures to sqlite db

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

prod

Merge branch '3.8'

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

report

Merge pull request #792 from romainneutron/configuration

2013-12-20 08:44:10 -08:00

setup

Use symfony translator

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

thesaurus

Remove phraseanet registry

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

email-template.html.twig

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

overview.html.twig

Add swfobject

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