Merge remote-tracking branch 'refs/remotes/afi/dev_#16861_sso_Kidilangues' into afi-master
# Conflicts: # application/modules/opac/controllers/ModulesController.php # library/Class/AdminVar.php # library/Class/Systeme/ModulesMenu.php # library/Class/UserGroup.php # library/Class/Users.php # tests/application/modules/opac/controllers/ModulesControllerMyCowTest.php # tests/application/modules/opac/controllers/ModulesControllerTest.php # tests/fixtures/RessourcesNumeriquesFixtures.php # tests/library/Class/Systeme/ModulesMenuTest.php
Showing
- VERSIONS_WIP/dev_#16861_SSO_Kidilangues 1 addition, 0 deletionsVERSIONS_WIP/dev_#16861_SSO_Kidilangues
- application/modules/opac/controllers/ModulesController.php 9 additions, 0 deletionsapplication/modules/opac/controllers/ModulesController.php
- library/Class/AdminVar.php 39 additions, 8 deletionslibrary/Class/AdminVar.php
- library/Class/KidilanguesLink.php 69 additions, 0 deletionslibrary/Class/KidilanguesLink.php
- library/Class/Systeme/ModulesMenu.php 1 addition, 0 deletionslibrary/Class/Systeme/ModulesMenu.php
- library/Class/Systeme/ModulesMenu/Kidilangues.php 56 additions, 0 deletionslibrary/Class/Systeme/ModulesMenu/Kidilangues.php
- library/Class/UserGroup.php 4 additions, 1 deletionlibrary/Class/UserGroup.php
- library/Class/Users.php 5 additions, 0 deletionslibrary/Class/Users.php
- tests/TestSpeedTrap.php 49 additions, 39 deletionstests/TestSpeedTrap.php
- tests/application/modules/opac/controllers/ModulesControllerKidilanguesTest.php 131 additions, 0 deletions...les/opac/controllers/ModulesControllerKidilanguesTest.php
- tests/application/modules/opac/controllers/ModulesControllerTest.php 1 addition, 1 deletion...cation/modules/opac/controllers/ModulesControllerTest.php
- tests/fixtures/RessourcesNumeriquesFixtures.php 21 additions, 0 deletionstests/fixtures/RessourcesNumeriquesFixtures.php
- tests/library/Class/KidilanguesLinkTest.php 76 additions, 0 deletionstests/library/Class/KidilanguesLinkTest.php
- tests/library/Class/Systeme/ModulesMenuTest.php 3 additions, 1 deletiontests/library/Class/Systeme/ModulesMenuTest.php
Please register or sign in to comment