Commit 1db99177 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'master' of https://git.unicaen.fr/lib/unicaen/app into HEAD

parents 30dc40bd b43d1a0c
Loading
Loading
Loading
Loading
Loading
+13 −7
Original line number Diff line number Diff line
@@ -51,8 +51,20 @@ use UnicaenApp\View\Helper\Upload\UploaderHelperFactory;
use UnicaenApp\View\Helper\UserProfileSelect;
use UnicaenApp\View\Helper\UserProfileSelectFactory;


return [
    /**
     * Paramétrage pour autorisation ou non de la connexion à une app de l'exterieur de l'établissement.
     */
    'hostlocalization' => [
        'activated' => false,
        'proxies' => [
            //xxx.xx.xx.xxx
        ],
        'reverse-proxies' => [
            //xxx.xx.xx.xxx
        ],
        'masque-ip' => '',
    ],
    'router'          => [
        'routes' => [
            // Base “route”, which describes the base match needed, the root of the tree
@@ -250,9 +262,6 @@ return [
            ],
        ],
    ],



    'console'         => [
        'router'       => [
            'routes' => [
@@ -283,9 +292,6 @@ return [
            'display_exceptions'       => true,
        ],
    ],



    'service_manager' => [
        'factories'          => [
            'translator'                  => 'Laminas\I18n\Translator\TranslatorServiceFactory',