hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-07-31 11:24:15 +02:00
parent 757ff848f0 f258cebdc0
commit 871da3e076
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
composer.lock generated
View File

@@ -49,6 +49,18 @@
"source-reference": "v2.2.3", "source-reference": "v2.2.3",
"commit-date": "1339767845" "commit-date": "1339767845"
}, },
{
"package": "guzzle/common",
"version": "v2.8.2"
},
{
"package": "guzzle/http",
"version": "v2.8.2"
},
{
"package": "guzzle/parser",
"version": "v2.8.2"
},
{ {
"package": "imagine/Imagine", "package": "imagine/Imagine",
"version": "dev-develop", "version": "dev-develop",
@@ -104,8 +116,8 @@
{ {
"package": "phpexiftool/phpexiftool", "package": "phpexiftool/phpexiftool",
"version": "dev-master", "version": "dev-master",
"source-reference": "5dc6e9a21e4b0faf6809070bc4f1cc4fef06ead6", "source-reference": "3e63a2713cfb15efdc7aa6b49e61080c31b5310d",
"commit-date": "1339680734" "commit-date": "1343328301"
}, },
{ {
"package": "pimple/pimple", "package": "pimple/pimple",
@@ -206,8 +218,8 @@
{ {
"package": "behat/mink-extension", "package": "behat/mink-extension",
"version": "dev-master", "version": "dev-master",
"source-reference": "da58c1b572349310ce5b65066a4d8b7e487a63a7", "source-reference": "bef6818b9538ef9ba75d1f5845fe71c1f5621ad1",
"commit-date": "1342818063" "commit-date": "1343146519"
}, },
{ {
"package": "behat/mink-goutte-driver", "package": "behat/mink-goutte-driver",
@@ -230,18 +242,14 @@
{ {
"package": "fabpot/goutte", "package": "fabpot/goutte",
"version": "dev-master", "version": "dev-master",
"source-reference": "c2ea8d9a6682d14482e57ede2371001b8a5238d2", "source-reference": "df14259688c7d6f1d366aa073a589695d2b9f451",
"commit-date": "1340264258" "commit-date": "1343194442"
}, },
{ {
"package": "fabpot/php-cs-fixer", "package": "fabpot/php-cs-fixer",
"version": "dev-master", "version": "dev-master",
"source-reference": "4c4bc75cc179ff91bb83960ae7dacca6754d2c46", "source-reference": "55701d65622b72cbe0db8d8f9136d36e45b2f7f4",
"commit-date": "1342957711" "commit-date": "1343202851"
},
{
"package": "guzzle/guzzle",
"version": "v2.6.6"
}, },
{ {
"package": "instaclick/php-webdriver", "package": "instaclick/php-webdriver",

2
lib/classes/appbox.class.php
View File

@@ -366,7 +366,7 @@ class appbox extends base
*/ */
$upgrader->set_current_message(_('Copying files')); $upgrader->set_current_message(_('Copying files'));
$origine = $registry->get('GV_RootPath') . 'config/'; $origine = $registry->get('GV_RootPath') . 'config/custom_files/';
$target = $registry->get('GV_RootPath') . 'www/custom/'; $target = $registry->get('GV_RootPath') . 'www/custom/';
$filesystem = $core['file-system']; $filesystem = $core['file-system'];