Merge remote-tracking branch...
Merge remote-tracking branch 'origin/dev#79874_explo_contractuel_chambery_connecteur_france_connect' into dev#106075_explo_france_connect_avec_identifiant_gpsea # Conflicts: # cosmogramme/sql/patch/patch_384.php # tests/db/UpgradeDBTest.php
Branches
Tags
Showing
- .gitmodules 3 additions, 0 deletions.gitmodules
- VERSIONS_WIP/79874 1 addition, 0 deletionsVERSIONS_WIP/79874
- application/modules/admin/controllers/IdentityProvidersController.php 34 additions, 0 deletions...modules/admin/controllers/IdentityProvidersController.php
- application/modules/admin/views/scripts/identity-providers/add.phtml 1 addition, 0 deletions.../modules/admin/views/scripts/identity-providers/add.phtml
- application/modules/admin/views/scripts/identity-providers/edit.phtml 8 additions, 0 deletions...modules/admin/views/scripts/identity-providers/edit.phtml
- application/modules/admin/views/scripts/identity-providers/index.phtml 18 additions, 0 deletions...odules/admin/views/scripts/identity-providers/index.phtml
- application/modules/opac/controllers/AbonneController.php 20 additions, 0 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/AuthController.php 10 additions, 297 deletionsapplication/modules/opac/controllers/AuthController.php
- application/modules/opac/controllers/IdentityProvidersController.php 48 additions, 0 deletions.../modules/opac/controllers/IdentityProvidersController.php
- application/modules/opac/views/scripts/abonne/associated-providers.phtml 38 additions, 0 deletions...ules/opac/views/scripts/abonne/associated-providers.phtml
- application/modules/opac/views/scripts/auth/ajax-login.phtml 4 additions, 0 deletionsapplication/modules/opac/views/scripts/auth/ajax-login.phtml
- application/modules/opac/views/scripts/auth/boite-login.phtml 5 additions, 5 deletions...ication/modules/opac/views/scripts/auth/boite-login.phtml
- application/modules/opac/views/scripts/auth/login.phtml 4 additions, 0 deletionsapplication/modules/opac/views/scripts/auth/login.phtml
- application/modules/telephone/controllers/AuthController.php 1 addition, 3 deletionsapplication/modules/telephone/controllers/AuthController.php
- cosmogramme/sql/patch/patch_384.php 1 addition, 1 deletioncosmogramme/sql/patch/patch_384.php
- cosmogramme/sql/patch/patch_385.php 21 additions, 0 deletionscosmogramme/sql/patch/patch_385.php
- library/Class/AdminVar.php 14 additions, 1 deletionlibrary/Class/AdminVar.php
- library/Class/Auth/Cas.php 95 additions, 0 deletionslibrary/Class/Auth/Cas.php
- library/Class/Auth/IdentityProvider.php 145 additions, 0 deletionslibrary/Class/Auth/IdentityProvider.php
- library/Class/Auth/Lectura.php 56 additions, 0 deletionslibrary/Class/Auth/Lectura.php
Please register or sign in to comment