Merge branch 'origin-hotline#15563_add_param_to_display_bibnum' into origin-hotline_6.49
Conflicts: VERSIONS
Showing
- VERSIONS 3 additions, 1 deletionVERSIONS
- library/Class/Album.php 1 addition, 0 deletionslibrary/Class/Album.php
- library/ZendAfi/Form/Album/DisplayAbstract.php 1 addition, 1 deletionlibrary/ZendAfi/Form/Album/DisplayAbstract.php
- library/ZendAfi/Form/Album/DisplayDiaporama.php 39 additions, 0 deletionslibrary/ZendAfi/Form/Album/DisplayDiaporama.php
- library/ZendAfi/View/Helper/TagSlideshow.php 22 additions, 18 deletionslibrary/ZendAfi/View/Helper/TagSlideshow.php
- public/admin/css/global.css 6 additions, 0 deletionspublic/admin/css/global.css
- tests/application/modules/admin/controllers/AlbumControllerTest.php 108 additions, 82 deletions...ication/modules/admin/controllers/AlbumControllerTest.php
- tests/application/modules/opac/controllers/BibNumeriqueControllerTest.php 53 additions, 46 deletions...n/modules/opac/controllers/BibNumeriqueControllerTest.php
Please register or sign in to comment