Damien Alexandre
|
b303de15d7
|
Add marvel to the provisionning (useful for the Sense query tool)
|
2014-11-07 11:29:49 +01:00 |
|
Mathieu Darse
|
5b24664001
|
Merge branch 'master' into elastic-indexer
Conflicts:
bin/console
|
2014-10-15 12:18:44 +02:00 |
|
Damien Alexandre
|
da036f5b21
|
Remove mongodb from the services in the VM
You will have to remove manualy /var/lib/mongodb/journal/*
to save space on the VM.
|
2014-10-13 13:26:02 +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 |
|
Nicolas Le Goff
|
7eb1a506fa
|
Merge branch '3.8'
Conflicts:
.gitignore
.travis.yml
Vagrantfile
lib/Alchemy/Phrasea/Controller/Datafiles.php
lib/Alchemy/Phrasea/Controller/Setup.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/classes/connection/pdo.php
lib/classes/task/period/subdef.php
lib/classes/task/period/writemeta.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/setup/step2.html.twig
vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
|
2014-09-09 15:05:13 +02:00 |
|
Nicolas Le Goff
|
233940d113
|
Improve VM build
|
2014-09-08 16:35:58 +02:00 |
|
Damien Alexandre
|
1d4a546d90
|
Provisioning: add ICU plugin and update Elasticsearch version
|
2014-09-08 12:48:32 +02:00 |
|
Nicolas Le Goff
|
de7988689e
|
Update directory structure & allow to configure paths (tmp, log, cache)
|
2014-09-05 15:57:00 +02:00 |
|