Merge remote-tracking branch 'refs/remotes/origin/master' into...
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_templates_pour_l_interface_publique_libraire_bootstrap Conflicts: application/modules/opac/views/scripts/recherche/viewnotice.phtml
Branches
Tags
Showing
- .htaccess 1 addition, 1 deletion.htaccess
- FEATURES/80658 10 additions, 0 deletionsFEATURES/80658
- VERSIONS 35 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/80658 1 addition, 0 deletionsVERSIONS_WIP/80658
- VERSIONS_WIP/80876 1 addition, 0 deletionsVERSIONS_WIP/80876
- VERSIONS_WIP/81435 1 addition, 0 deletionsVERSIONS_WIP/81435
- VERSIONS_WIP/83983 1 addition, 0 deletionsVERSIONS_WIP/83983
- application/modules/admin/controllers/BibController.php 0 additions, 25 deletionsapplication/modules/admin/controllers/BibController.php
- application/modules/admin/controllers/OuverturesController.php 8 additions, 0 deletions...cation/modules/admin/controllers/OuverturesController.php
- application/modules/admin/controllers/UploadController.php 1 addition, 2 deletionsapplication/modules/admin/controllers/UploadController.php
- application/modules/admin/views/scripts/ouvertures/list.phtml 0 additions, 0 deletions...ication/modules/admin/views/scripts/ouvertures/list.phtml
- application/modules/opac/controllers/BlogController.php 1 addition, 1 deletionapplication/modules/opac/controllers/BlogController.php
- application/modules/opac/controllers/RechercheController.php 26 additions, 0 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/views/scripts/blog/viewcritiques.phtml 15 additions, 5 deletions...ation/modules/opac/views/scripts/blog/viewcritiques.phtml
- build.sh 5 additions, 1 deletionbuild.sh
- cosmogramme/cosmozend/application/modules/cosmo/controllers/FacetsController.php 5 additions, 89 deletions...pplication/modules/cosmo/controllers/FacetsController.php
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/facets/add.phtml 2 additions, 18 deletions.../application/modules/cosmo/views/scripts/facets/add.phtml
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/facets/edit.phtml 3 additions, 0 deletions...application/modules/cosmo/views/scripts/facets/edit.phtml
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/facets/index.phtml 13 additions, 28 deletions...pplication/modules/cosmo/views/scripts/facets/index.phtml
- cosmogramme/cosmozend/application/modules/cosmo/views/scripts/module.phtml 5 additions, 3 deletions...zend/application/modules/cosmo/views/scripts/module.phtml
Please register or sign in to comment