Merge branch 'master' into dev_jamendo
Showing
- VERSIONS 31 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/merge_fix_on_patch_250 1 addition, 0 deletionsVERSIONS_HOTLINE/merge_fix_on_patch_250
- VERSIONS_WIP/19571 1 addition, 0 deletionsVERSIONS_WIP/19571
- VERSIONS_WIP/21425 1 addition, 0 deletionsVERSIONS_WIP/21425
- VERSIONS_WIP/25334 1 addition, 0 deletionsVERSIONS_WIP/25334
- VERSIONS_WIP/dev15606_patron_pickup_library 0 additions, 2 deletionsVERSIONS_WIP/dev15606_patron_pickup_library
- VERSIONS_WIP/dev19572_miop_typo3_import_vignettes 2 additions, 0 deletionsVERSIONS_WIP/dev19572_miop_typo3_import_vignettes
- application/modules/admin/controllers/AlbumController.php 9 additions, 10 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/controllers/CatalogueController.php 12 additions, 0 deletions...ication/modules/admin/controllers/CatalogueController.php
- application/modules/admin/controllers/CmsController.php 19 additions, 16 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/views/scripts/accueil/critiques.phtml 99 additions, 64 deletions...ation/modules/admin/views/scripts/accueil/critiques.phtml
- application/modules/admin/views/scripts/modo/index.phtml 3 additions, 4 deletionsapplication/modules/admin/views/scripts/modo/index.phtml
- application/modules/opac/controllers/BlogController.php 50 additions, 48 deletionsapplication/modules/opac/controllers/BlogController.php
- application/modules/opac/controllers/CasServerV10Controller.php 9 additions, 4 deletions...ation/modules/opac/controllers/CasServerV10Controller.php
- application/modules/opac/controllers/CmsController.php 3 additions, 1 deletionapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/controllers/ModulesController.php 2 additions, 2 deletionsapplication/modules/opac/controllers/ModulesController.php
- application/modules/opac/controllers/RechercheController.php 1 addition, 2 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/controllers/SitoController.php 16 additions, 29 deletionsapplication/modules/opac/controllers/SitoController.php
- application/modules/opac/views/scripts/blog/hierarchical.phtml 8 additions, 0 deletions...cation/modules/opac/views/scripts/blog/hierarchical.phtml
- cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/IntegrationControllerTest.php 2 additions, 2 deletions...n/modules/cosmo/controllers/IntegrationControllerTest.php
Please register or sign in to comment