Merge branch 'master' into dev#33376_api_redmine
Conflicts: cosmogramme/sql/patch/patch_283.php tests/db/UpgradeDBTest.php
Branches
Tags
Showing
- .htaccess 1 addition, 1 deletion.htaccess
- VERSIONS 24 additions, 0 deletionsVERSIONS
- VERSIONS_WIP/25892 1 addition, 0 deletionsVERSIONS_WIP/25892
- VERSIONS_WIP/25957 1 addition, 0 deletionsVERSIONS_WIP/25957
- VERSIONS_WIP/30641 1 addition, 0 deletionsVERSIONS_WIP/30641
- VERSIONS_WIP/34308 1 addition, 0 deletionsVERSIONS_WIP/34308
- VERSIONS_WIP/7334 1 addition, 0 deletionsVERSIONS_WIP/7334
- application/modules/admin/controllers/AlbumController.php 1 addition, 1 deletionapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/views/scripts/accueil/kiosque.phtml 7 additions, 1 deletion...ication/modules/admin/views/scripts/accueil/kiosque.phtml
- application/modules/admin/views/scripts/album/dilicom.phtml 4 additions, 2 deletionsapplication/modules/admin/views/scripts/album/dilicom.phtml
- application/modules/opac/controllers/AbonneController.php 28 additions, 15 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/ModulesController.php 12 additions, 1 deletionapplication/modules/opac/controllers/ModulesController.php
- application/modules/opac/controllers/NoticeajaxController.php 3 additions, 7 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- application/modules/opac/controllers/RechercheController.php 77 additions, 20 deletionsapplication/modules/opac/controllers/RechercheController.php
- application/modules/opac/views/scripts/abonne/prets.phtml 20 additions, 1 deletionapplication/modules/opac/views/scripts/abonne/prets.phtml
- application/modules/opac/views/scripts/abonne/prolonger-pret.phtml 0 additions, 1 deletion...on/modules/opac/views/scripts/abonne/prolonger-pret.phtml
- application/modules/opac/views/scripts/abonne/reservations.phtml 15 additions, 62 deletions...tion/modules/opac/views/scripts/abonne/reservations.phtml
- application/modules/opac/views/scripts/auth/ajax-login.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/auth/ajax-login.phtml
- application/modules/opac/views/scripts/auth/boite-login.phtml 1 addition, 1 deletion...ication/modules/opac/views/scripts/auth/boite-login.phtml
- application/modules/opac/views/scripts/recherche/consultation-pickup-ajax.phtml 3 additions, 0 deletions...ac/views/scripts/recherche/consultation-pickup-ajax.phtml
Please register or sign in to comment