Nicolas Le Goff ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer ...

Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css

2015-03-10 14:36:31 +01:00

..

Converter

Fix CS

2014-07-17 15:17:04 +02:00

Entities

Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer

2015-03-10 14:36:31 +01:00

Manager

Report previous patches

2015-02-09 13:42:26 +01:00

Manipulator

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

Repositories

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

Serializer

Add elastic-search engine support

2014-01-27 20:12:13 +01:00

Types

Fix CS

2014-03-23 23:07:01 +01:00

MutableRecordInterface.php

Refactor status display

2015-02-19 15:14:23 +01:00

NativeQueryProvider.php

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

RecordInterface.php

Refactor status display

2015-02-19 15:14:23 +01:00