Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 10 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/MultimediaController.php 1 addition, 27 deletions...cation/modules/admin/controllers/MultimediaController.php
- application/modules/admin/controllers/OuverturesController.php 1 addition, 1 deletion...cation/modules/admin/controllers/OuverturesController.php
- application/modules/opac/controllers/AbonneController.php 17 additions, 2 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/views/scripts/abonne/multimedia-hold-day.phtml 6 additions, 1 deletion...dules/opac/views/scripts/abonne/multimedia-hold-day.phtml
- application/modules/opac/views/scripts/abonne/multimedia-hold-device.phtml 11 additions, 1 deletion...es/opac/views/scripts/abonne/multimedia-hold-device.phtml
- application/modules/opac/views/scripts/abonne/multimedia-hold-group.phtml 10 additions, 1 deletion...les/opac/views/scripts/abonne/multimedia-hold-group.phtml
- application/modules/opac/views/scripts/abonne/multimedia-hold-hours.phtml 8 additions, 1 deletion...les/opac/views/scripts/abonne/multimedia-hold-hours.phtml
- application/modules/push/controllers/MultimediaController.php 5 additions, 5 deletions...ication/modules/push/controllers/MultimediaController.php
- library/Class/Multimedia/AuthenticateRequest.php 36 additions, 4 deletionslibrary/Class/Multimedia/AuthenticateRequest.php
- library/Class/Multimedia/Device.php 23 additions, 10 deletionslibrary/Class/Multimedia/Device.php
- library/Class/Multimedia/DeviceGroup.php 7 additions, 2 deletionslibrary/Class/Multimedia/DeviceGroup.php
- library/Class/Multimedia/Location.php 7 additions, 8 deletionslibrary/Class/Multimedia/Location.php
- library/Class/Multimedia/Users.php 5 additions, 4 deletionslibrary/Class/Multimedia/Users.php
- library/Class/Profil.php 45 additions, 0 deletionslibrary/Class/Profil.php
- library/ZendAfi/View/Helper/Abonne/Multimedia.php 8 additions, 7 deletionslibrary/ZendAfi/View/Helper/Abonne/Multimedia.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/OuverturesControllerTest.php 7 additions, 7 deletions...on/modules/admin/controllers/OuverturesControllerTest.php
- tests/application/modules/opac/controllers/AbonneControllerMultimediaTest.php 58 additions, 102 deletions...dules/opac/controllers/AbonneControllerMultimediaTest.php
- tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php 50 additions, 1 deletion.../modules/opac/controllers/ProfilOptionsControllerTest.php
Please register or sign in to comment