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

Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589

Browse Source
This commit is contained in:
Mike Ng
2018-01-09 09:50:57 +04:00
parent 2c75dc654f
commit 4c11cfebd8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ class RegistryFormManipulator
'thumb-substitution' => true, 'thumb-substitution' => true,
'anonymous-report' => false, 'anonymous-report' => false,
], ],
'actions' => [ 'actions' => [
'download-max-size' => 120, 'download-max-size' => 120,
'validation-reminder-days' => 2, 'validation-reminder-days' => 2,
'validation-expiration-days' => 10, 'validation-expiration-days' => 10,
@@ -123,7 +123,7 @@ class RegistryFormManipulator
'force-push-authentication' => false, 'force-push-authentication' => false,
'enable-feed-notification' => true, 'enable-feed-notification' => true,
], ],
'ftp' => [ 'ftp' => [
'ftp-enabled' => false, 'ftp-enabled' => false,
'ftp-user-access' => false, 'ftp-user-access' => false,
], ],
@@ -131,16 +131,16 @@ class RegistryFormManipulator
'auto-select-collections' => true, 'auto-select-collections' => true,
'auto-register-enabled' => false, 'auto-register-enabled' => false,
], ],
'maintenance' => [ 'maintenance' => [
'message' => 'The application is down for maintenance', 'message' => 'The application is down for maintenance',
'enabled' => false, 'enabled' => false,
], ],
'api-clients' => [ 'api-clients' => [
'api-enabled' => true, 'api-enabled' => true,
'navigator-enabled' => true, 'navigator-enabled' => true,
'office-enabled' => true, 'office-enabled' => true,
], ],
'webservices' => [ 'webservices' => [
'google-charts-enabled' => true, 'google-charts-enabled' => true,
'geonames-server' => 'http://geonames.alchemyasp.com/', 'geonames-server' => 'http://geonames.alchemyasp.com/',
'captchas-enabled' => false, 'captchas-enabled' => false,

3
templates/web/common/menubar.html.twig
View File

@@ -155,7 +155,8 @@
</div> </div>
{% endif %} {% endif %}
<div title="" class="context-menu-item menu3-custom-item"> <div title="" class="context-menu-item menu3-custom-item">
<div style="" class="context-menu-item-inner infoDialog" infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</div> <div style="" class="context-menu-item-inner infoDialog"
infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</div>
</div> </div>
</div> </div>
</td> </td>