Merge remote-tracking branch 'origin/dev#13881-lekiosk'
Conflicts: application/modules/opac/controllers/ModulesController.php
Showing
- application/modules/admin/controllers/UsergroupController.php 1 addition, 24 deletions...ication/modules/admin/controllers/UsergroupController.php
- application/modules/opac/controllers/ModulesController.php 24 additions, 28 deletionsapplication/modules/opac/controllers/ModulesController.php
- library/Class/AdminVar.php 10 additions, 2 deletionslibrary/Class/AdminVar.php
- library/Class/LeKioskLink.php 70 additions, 0 deletionslibrary/Class/LeKioskLink.php
- library/Class/Systeme/ModulesMenu.php 1 addition, 0 deletionslibrary/Class/Systeme/ModulesMenu.php
- library/Class/Systeme/ModulesMenu/ArteVod.php 3 additions, 0 deletionslibrary/Class/Systeme/ModulesMenu/ArteVod.php
- library/Class/Systeme/ModulesMenu/LeKiosk.php 60 additions, 0 deletionslibrary/Class/Systeme/ModulesMenu/LeKiosk.php
- library/Class/Systeme/ModulesMenu/MusicMe.php 3 additions, 0 deletionslibrary/Class/Systeme/ModulesMenu/MusicMe.php
- library/Class/Systeme/ModulesMenu/Numilog.php 3 additions, 0 deletionslibrary/Class/Systeme/ModulesMenu/Numilog.php
- library/Class/UserGroup.php 29 additions, 1 deletionlibrary/Class/UserGroup.php
- library/Class/Users.php 5 additions, 0 deletionslibrary/Class/Users.php
- tests/application/modules/admin/controllers/UserGroupControllerTest.php 28 additions, 45 deletions...ion/modules/admin/controllers/UserGroupControllerTest.php
- tests/application/modules/opac/controllers/ModulesControllerTest.php 46 additions, 25 deletions...cation/modules/opac/controllers/ModulesControllerTest.php
- tests/library/Class/LeKioskLinkTest.php 35 additions, 0 deletionstests/library/Class/LeKioskLinkTest.php
- tests/library/Class/RessourcesNumeriquesFixtures.php 19 additions, 1 deletiontests/library/Class/RessourcesNumeriquesFixtures.php
- tests/library/Class/Systeme/ModulesMenu/CvsTest.php 62 additions, 0 deletionstests/library/Class/Systeme/ModulesMenu/CvsTest.php
- tests/library/Class/Systeme/ModulesMenu/MusicMeTest.php 58 additions, 0 deletionstests/library/Class/Systeme/ModulesMenu/MusicMeTest.php
- tests/library/Class/Systeme/ModulesMenu/NumilogTest.php 56 additions, 0 deletionstests/library/Class/Systeme/ModulesMenu/NumilogTest.php
- tests/library/Class/Systeme/ModulesMenu/ToutApprendreTest.php 58 additions, 0 deletions...s/library/Class/Systeme/ModulesMenu/ToutApprendreTest.php
- tests/library/Class/Systeme/ModulesMenu/VodeclicTest.php 57 additions, 0 deletionstests/library/Class/Systeme/ModulesMenu/VodeclicTest.php
Please register or sign in to comment