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

..

collection

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

common

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

databox

Merge branch '3.8'

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

fields

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

publications

Address PR comments

2014-02-19 17:29:27 +01:00

search-engine

Add elastic-search engine support

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

statusbit

Merge remote-tracking branch 'upstream/3.8'

2015-02-23 19:16:56 +01:00

task-manager

Add elasticsearch reindex events

2015-01-26 16:04:23 +01:00

user

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

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

connected-users.html.twig

Fix connected user tooltip

2015-02-06 14:27:46 +01:00

dashboard.html.twig

Fix tests

2014-02-19 17:29:26 +01:00

databases.html.twig

Remove unused code

2014-03-05 16:53:03 +01:00

editusers_masks.html.twig

Merge branch '3.8'

2014-02-24 12:27:49 +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

Fix javascript issues

2015-02-06 19:14:21 +01:00

index.html.twig

Fix javascript issues

2015-02-06 19:14:21 +01:00

setup.html.twig

Fix latest merge

2014-08-13 17:40:40 +02:00

statusbit.html.twig

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

2015-03-10 14:36:31 +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

Fix latest merge

2014-06-19 16:11:27 +02:00

users.html.twig

Fix javascript issues

2015-02-06 19:14:21 +01:00