There was an error fetching the commit references. Please try again later.
Merge branch 'origin-stable' into hotline-master
Conflicts: VERSIONS library/startup.php tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php
Showing
- VERSIONS 19 additions, 7 deletionsVERSIONS
- application/modules/opac/controllers/BibController.php 3 additions, 1 deletionapplication/modules/opac/controllers/BibController.php
- application/modules/opac/views/scripts/bib/selection.phtml 4 additions, 1 deletionapplication/modules/opac/views/scripts/bib/selection.phtml
- library/ZendAfi/Controller/Plugin/SelectionBib.php 3 additions, 2 deletionslibrary/ZendAfi/Controller/Plugin/SelectionBib.php
- library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php 27 additions, 20 deletionslibrary/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
- library/ZendAfi/View/Helper/TagRechercheSimple.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/TagRechercheSimple.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- public/admin/js/onload_utils.js 2 additions, 4 deletionspublic/admin/js/onload_utils.js
- public/opac/js/recherche.js 2 additions, 1 deletionpublic/opac/js/recherche.js
- tests/application/modules/opac/controllers/BibControllerTest.php 12 additions, 8 deletions...pplication/modules/opac/controllers/BibControllerTest.php
- tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php 14 additions, 2 deletions...library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php
Please register or sign in to comment