Commit Graph

12 Commits

Author SHA1 Message Date
Thibaud Fabre
888a2b4bb6 Add configuration option to disable SSL requirement on API 2016-05-24 15:38:59 +02:00
Florian BLOUET
261339ecd5 remove recess, bower, grunt and uglifyJs dependencies in php utils and tests
updated minifier tests
2015-12-02 17:36:37 +01:00
Benoît Burnichon
31116a14a9 Remove OpCache options as now bundled with PHP5.5+ 2015-05-06 12:00:28 +02:00
Benoît Burnichon
ef68007132 Remove references to Phrasea Indexer. 2015-03-23 18:13:58 +01:00
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
Benoît Burnichon
b651d32a4c Remove old .bowerrc copy. 2015-03-03 17:40:18 +01:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer
Conflicts:
	bin/console
2014-10-15 12:18:44 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer
Conflicts:
	.gitignore
2014-10-06 18:24:58 +02:00
Damien Alexandre
e31b138e2f Set back the logger on Elasticsearch client, not pleased with the format 2014-09-22 11:34:14 +02:00
Nicolas Le Goff
233940d113 Improve VM build 2014-09-08 16:35:58 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00