Merge branch 'master' into dev#16555_ccbs
Conflicts: tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
Branches
Tags
Showing
- CONTRIB.fr.md 1 addition, 1 deletionCONTRIB.fr.md
- UPGRADE.fr.md 33 additions, 0 deletionsUPGRADE.fr.md
- VERSIONS 66 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/BibController.php 202 additions, 131 deletionsapplication/modules/admin/controllers/BibController.php
- application/modules/admin/controllers/CmsController.php 46 additions, 16 deletionsapplication/modules/admin/controllers/CmsController.php
- application/modules/admin/controllers/ModoController.php 40 additions, 36 deletionsapplication/modules/admin/controllers/ModoController.php
- application/modules/admin/controllers/ProfilController.php 156 additions, 129 deletionsapplication/modules/admin/controllers/ProfilController.php
- application/modules/admin/views/scripts/bib/addlocalisation.phtml 1 addition, 0 deletions...ion/modules/admin/views/scripts/bib/addlocalisation.phtml
- application/modules/admin/views/scripts/bib/addplan.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/bib/addplan.phtml
- application/modules/admin/views/scripts/bib/localisations.phtml 29 additions, 13 deletions...ation/modules/admin/views/scripts/bib/localisations.phtml
- application/modules/admin/views/scripts/bib/localisationsmaj.phtml 29 additions, 23 deletions...on/modules/admin/views/scripts/bib/localisationsmaj.phtml
- application/modules/admin/views/scripts/bib/plans.phtml 9 additions, 9 deletionsapplication/modules/admin/views/scripts/bib/plans.phtml
- application/modules/admin/views/scripts/bib/plansmaj.phtml 4 additions, 4 deletionsapplication/modules/admin/views/scripts/bib/plansmaj.phtml
- application/modules/admin/views/scripts/profil/_formProfil.phtml 4 additions, 0 deletions...tion/modules/admin/views/scripts/profil/_formProfil.phtml
- application/modules/admin/views/scripts/profil/accueil.phtml 128 additions, 118 deletionsapplication/modules/admin/views/scripts/profil/accueil.phtml
- application/modules/admin/views/scripts/suggestion-achat/index.phtml 14 additions, 2 deletions.../modules/admin/views/scripts/suggestion-achat/index.phtml
- application/modules/opac/controllers/AbonneController.php 4 additions, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/BibNumeriqueController.php 10 additions, 10 deletions...ation/modules/opac/controllers/BibNumeriqueController.php
- application/modules/opac/controllers/NoticeajaxController.php 6 additions, 3 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- application/modules/opac/controllers/RechercheController.php 38 additions, 1 deletionapplication/modules/opac/controllers/RechercheController.php
Please register or sign in to comment