Commit 2179e160 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

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

 Conflicts:
	config/module.config.php
	src/UnicaenApp/Session/SessionManagerFactory.php
	tests/UnicaenAppTest/Session/SessionManagerFactoryTest.php
parents d77dc593 d0b463ad
Loading
Loading
Loading
Loading
Loading
+8
Changes for CHANGELOG.md: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
CHANGELOG
=========

3.1.23
------
- Suppression de la SessionManagerFactory jamais utilisée car mal configurée.

3.1.22
------
- Le composant TabAjax ajoute les urls dans les attributs data-url des tab-panes

3.1.21
------
- Dépendance composer supprimée : zfcampus/zf-asset-manager.
−2
Changes for config/module.config.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -281,8 +281,6 @@ return [
        'factories'          => [
            'translator'                  => 'Laminas\I18n\Translator\TranslatorServiceFactory',
            'navigation'                  => 'Laminas\Navigation\Service\DefaultNavigationFactory',
            // service de gestion de la session
            'Laminas\Session\SessionManager' => 'UnicaenApp\Session\SessionManagerFactory',
            // service d'accès aux options de config de ce module
            'unicaen-app_module_options'  => 'UnicaenApp\Options\ModuleOptionsFactory',
            // mapper d'accès aux individus de l'annuaire LDAP
−38

File deleted.

+1
Changes for src/UnicaenApp/View/Helper/TabAjax/TabAjaxViewHelper.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ class TabAjaxViewHelper extends AbstractHtmlElement
        $attrs = [
            'role'     => 'tabpanel',
            'class'    => ['tab-pane'],
            'data-url' => $tab->getUrl(),
            'id'       => $id,
        ];
        if ($this->getSelected() === $tab) $attrs['class'][] = 'active';
−51

File deleted.