Commit Graph

10 Commits

Author SHA1 Message Date
Nicolas Le Goff
d431c16a0d Merge pull request #1261 from bburnichon/feature/install-fixes
Fixup installation process
2015-03-04 19:35:57 +01:00
Benoît Burnichon
587e89af2f Change locale to use the english one. 2015-03-04 17:30:04 +01:00
Benoît Burnichon
a680e8b817 Add memcached and zip debian packages. 2015-03-04 17:29:41 +01:00
Benoît Burnichon
2e74467c79 add vagrant dir to ignored, increase vm memory to 4G 2015-03-04 16:33:59 +01:00
Benoît Burnichon
b651d32a4c Remove old .bowerrc copy. 2015-03-03 17:40:18 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +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
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00