Merge branch 'master' into...
Merge branch 'master' into origin-dev#34523_story_gestion_des_classifications_autres_que_pcdm4_et_dewey Conflicts: library/ZendAfi/View/Helper/Admin/HelpLink.php
Branches
Tags
Showing
- FEATURES/80658 0 additions, 10 deletionsFEATURES/80658
- VERSIONS 51 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/80658 0 additions, 1 deletionVERSIONS_WIP/80658
- VERSIONS_WIP/80876 0 additions, 1 deletionVERSIONS_WIP/80876
- VERSIONS_WIP/81435 0 additions, 1 deletionVERSIONS_WIP/81435
- VERSIONS_WIP/83983 0 additions, 1 deletionVERSIONS_WIP/83983
- VERSIONS_WIP/84280 0 additions, 1 deletionVERSIONS_WIP/84280
- VERSIONS_WIP/85632 0 additions, 1 deletionVERSIONS_WIP/85632
- application/modules/admin/controllers/CatalogueController.php 18 additions, 15 deletions...ication/modules/admin/controllers/CatalogueController.php
- application/modules/admin/controllers/RecordsController.php 4 additions, 1 deletionapplication/modules/admin/controllers/RecordsController.php
- application/modules/opac/controllers/AbonneController.php 9 additions, 9 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/AuthorController.php 37 additions, 0 deletionsapplication/modules/opac/controllers/AuthorController.php
- application/modules/opac/controllers/NoticeajaxController.php 8 additions, 20 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- application/modules/opac/controllers/RechercheController.php 1 addition, 0 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/controllers/RssController.php 1 addition, 1 deletionapplication/modules/opac/controllers/RssController.php
- application/modules/opac/views/scripts/java/cube.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/java/cube.phtml
- application/modules/opac/views/scripts/java/diaporama.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/java/diaporama.phtml
- application/modules/opac/views/scripts/java/jcarousel.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/java/jcarousel.phtml
- application/modules/opac/views/scripts/java/mycarousel_partial.phtml 1 addition, 1 deletion.../modules/opac/views/scripts/java/mycarousel_partial.phtml
- application/modules/opac/views/scripts/java/protoflow.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/java/protoflow.phtml
Please register or sign in to comment