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

Merge branch 'master' into PHRAS-3081-sqllite-db-to-appbox

Browse Source
This commit is contained in:
Nicolas Maillat
2020-05-27 14:51:42 +02:00
committed by GitHub
parent ba4d3677aa 4d6cc11d96
commit 2f1b90ad00
6 changed files with 188 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
View File

@@ -181,19 +181,14 @@ class RegistryFormManipulator
],
'custom-links' => [
[
'linkName' => 'Phraseanet store',
'linkLanguage' => 'fr',
'linkUrl' => 'https://alchemy.odoo.com/shop',
'linkLocation' => 'help-menu',
'linkOrder' => '1',
],
[
'linkName' => 'Phraseanet store',
'linkLanguage' => 'en',
'linkUrl' => 'https://alchemy.odoo.com/en_US/shop',
'linkLocation' => 'help-menu',
'linkOrder' => '1',
],
'linkName' => 'Phraseanet store',
'linkLanguage' => 'all',
'linkUrl' => 'https://store.alchemy.fr',
'linkLocation' => 'help-menu',
'linkOrder' => 1,
'linkBold' => false,
'linkColor' => ''
]
]
];
}

2
lib/Alchemy/Phrasea/Core/Version.php
View File

@@ -16,7 +16,7 @@ class Version
/**
* @var string
*/
private $number = '4.1.0-alpha.29a';
/**

2
lib/Alchemy/Phrasea/Setup/Installer.php
View File

@@ -198,7 +198,7 @@ class Installer
$config['main']['database']['driver'] = 'pdo_mysql';
$config['main']['database']['charset'] = 'UTF8';
$config['main']['binaries'] = $binaryData;
$config['main']['binaries'] = array_merge($config['main']['binaries'], $binaryData);
$config['servername'] = $serverName;
$config['main']['key'] = $this->app['random.medium']->generateString(16);