Merge branch 'lille_dev' into 'dev#162559_mel_maj_api_cafeyn'
# Conflicts: # tests/library/Class/MoteurRechercheTest.php
Showing
- FEATURES/167576 10 additions, 0 deletionsFEATURES/167576
- FEATURES/175476 10 additions, 0 deletionsFEATURES/175476
- VERSIONS_WIP/167576 1 addition, 0 deletionsVERSIONS_WIP/167576
- VERSIONS_WIP/175476 1 addition, 0 deletionsVERSIONS_WIP/175476
- application/modules/admin/controllers/PortalBorrowersController.php 56 additions, 4 deletions...n/modules/admin/controllers/PortalBorrowersController.php
- application/modules/admin/views/scripts/portal-borrowers/waitings.phtml 21 additions, 0 deletions...dules/admin/views/scripts/portal-borrowers/waitings.phtml
- catalogue_tout_page_1.xml 17303 additions, 0 deletionscatalogue_tout_page_1.xml
- catalogue_tout_page_2.xml 17303 additions, 0 deletionscatalogue_tout_page_2.xml
- catalogue_tout_page_3.xml 17451 additions, 0 deletionscatalogue_tout_page_3.xml
- catalogue_tout_page_5001.xml 9426 additions, 0 deletionscatalogue_tout_page_5001.xml
- catalogue_tout_page_501.xml 9426 additions, 0 deletionscatalogue_tout_page_501.xml
- catalogue_tout_page_51.xml 17837 additions, 0 deletionscatalogue_tout_page_51.xml
- catalogue_tout_page_6.xml 17495 additions, 0 deletionscatalogue_tout_page_6.xml
- library/Class/Bib/PortalBorrowers.php 38 additions, 12 deletionslibrary/Class/Bib/PortalBorrowers.php
- library/Class/DigitalResource.php 1 addition, 0 deletionslibrary/Class/DigitalResource.php
- library/Class/DigitalResource/AlbumViewHelper.php 3 additions, 1 deletionlibrary/Class/DigitalResource/AlbumViewHelper.php
- library/Class/DigitalResource/WebServiceAbstract.php 104 additions, 0 deletionslibrary/Class/DigitalResource/WebServiceAbstract.php
- library/Class/IdentityProvider.php 2 additions, 1 deletionlibrary/Class/IdentityProvider.php
- library/Class/IdentityProvider/C3rb.php 40 additions, 0 deletionslibrary/Class/IdentityProvider/C3rb.php
- library/Class/IdentityProvider/Types.php 4 additions, 2 deletionslibrary/Class/IdentityProvider/Types.php