Merge branch 'master' into...
Merge branch 'master' into dev#27763_sitotheque_avoir_une_option_pour_desindexer_un_site_comme_pour_les_articles Conflicts: cosmogramme/php/_init.php cosmogramme/sql/patch/patch_272.php
Branches
Tags
Showing
- VERSIONS 55 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/25569 1 addition, 0 deletionsVERSIONS_WIP/25569
- VERSIONS_WIP/25728 1 addition, 0 deletionsVERSIONS_WIP/25728
- VERSIONS_WIP/27641 1 addition, 0 deletionsVERSIONS_WIP/27641
- VERSIONS_WIP/32110 1 addition, 0 deletionsVERSIONS_WIP/32110
- application/modules/admin/controllers/CmsController.php 5 additions, 2 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/controllers/ModoController.php 56 additions, 7 deletionsapplication/modules/admin/controllers/ModoController.php
- application/modules/admin/controllers/UsersController.php 1 addition, 2 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/accueil/sitotheque.phtml 14 additions, 2 deletions...tion/modules/admin/views/scripts/accueil/sitotheque.phtml
- application/modules/admin/views/scripts/modo/_avis_partial.phtml 6 additions, 1 deletion...tion/modules/admin/views/scripts/modo/_avis_partial.phtml
- application/modules/admin/views/scripts/modo/avisnotice.phtml 18 additions, 8 deletions...ication/modules/admin/views/scripts/modo/avisnotice.phtml
- application/modules/admin/views/scripts/users/_form.phtml 21 additions, 10 deletionsapplication/modules/admin/views/scripts/users/_form.phtml
- application/modules/opac/controllers/AbonneController.php 6 additions, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/BibNumeriqueController.php 94 additions, 11 deletions...ation/modules/opac/controllers/BibNumeriqueController.php
- application/modules/opac/controllers/BlogController.php 1 addition, 0 deletionsapplication/modules/opac/controllers/BlogController.php
- application/modules/opac/controllers/CmsController.php 4 additions, 84 deletionsapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/controllers/RssController.php 3 additions, 2 deletionsapplication/modules/opac/controllers/RssController.php
- application/modules/opac/controllers/SitoController.php 17 additions, 8 deletionsapplication/modules/opac/controllers/SitoController.php
- application/modules/opac/views/scripts/bib-numerique/consult-book-open.phtml 8 additions, 0 deletions.../opac/views/scripts/bib-numerique/consult-book-open.phtml
- application/modules/opac/views/scripts/bib-numerique/consult-book.phtml 9 additions, 0 deletions...dules/opac/views/scripts/bib-numerique/consult-book.phtml
Please register or sign in to comment