Merge branch 'origin-hotline' into origin-master
# Conflicts: # tests/scenarios/Templates/TemplatesAbonneTest.php
Showing
- VERSIONS_HOTLINE/140322 1 addition, 0 deletionsVERSIONS_HOTLINE/140322
- VERSIONS_HOTLINE/141990 1 addition, 0 deletionsVERSIONS_HOTLINE/141990
- VERSIONS_HOTLINE/142649 1 addition, 0 deletionsVERSIONS_HOTLINE/142649
- VERSIONS_HOTLINE/143141 1 addition, 0 deletionsVERSIONS_HOTLINE/143141
- VERSIONS_HOTLINE/143478 1 addition, 0 deletionsVERSIONS_HOTLINE/143478
- application/modules/opac/controllers/RechercheController.php 6 additions, 4 deletionsapplication/modules/opac/controllers/RechercheController.php
- library/Class/Cosmogramme/Integration/PhaseFlushIntegrations.php 36 additions, 15 deletions.../Class/Cosmogramme/Integration/PhaseFlushIntegrations.php
- library/Class/DigitalResource.php 18 additions, 0 deletionslibrary/Class/DigitalResource.php
- library/Class/DigitalResource/Config.php 53 additions, 1 deletionlibrary/Class/DigitalResource/Config.php
- library/Class/DigitalResource/Harvester/OAI.php 103 additions, 0 deletionslibrary/Class/DigitalResource/Harvester/OAI.php
- library/Class/DigitalResource/Importer/OAI.php 121 additions, 0 deletionslibrary/Class/DigitalResource/Importer/OAI.php
- library/Class/DigitalResource/OAI/AbstractInitJob.php 109 additions, 0 deletionslibrary/Class/DigitalResource/OAI/AbstractInitJob.php
- library/Class/FileManager.php 21 additions, 0 deletionslibrary/Class/FileManager.php
- library/Class/FileManager/FileSystem.php 26 additions, 12 deletionslibrary/Class/FileManager/FileSystem.php
- library/Class/Migration/AlbumClearCodif.php 177 additions, 0 deletionslibrary/Class/Migration/AlbumClearCodif.php
- library/Class/User/CardsOperationDecorator.php 2 additions, 2 deletionslibrary/Class/User/CardsOperationDecorator.php
- library/Class/WebService/BibNumerique/AbstractOAI.php 6 additions, 1 deletionlibrary/Class/WebService/BibNumerique/AbstractOAI.php
- library/Class/WebService/BibNumerique/ArteVOD/Config.php 5 additions, 0 deletionslibrary/Class/WebService/BibNumerique/ArteVOD/Config.php
- library/Class/WebService/OAI.php 76 additions, 15 deletionslibrary/Class/WebService/OAI.php
- library/Class/WebService/SIGB/AbstractRESTService.php 19 additions, 2 deletionslibrary/Class/WebService/SIGB/AbstractRESTService.php
Please register or sign in to comment