Merge branch 'dev#38670_favoris_libraries'
Conflicts: library/ZendAfi/View/Helper/Bouton.php
Showing
- VERSIONS_WIP/38670 1 addition, 0 deletionsVERSIONS_WIP/38670
- application/modules/opac/controllers/AbonneController.php 10 additions, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- library/Class/Bib.php 25 additions, 5 deletionslibrary/Class/Bib.php
- library/Class/Catalogue.php 2 additions, 18 deletionslibrary/Class/Catalogue.php
- library/Class/CodifAnnexe.php 23 additions, 1 deletionlibrary/Class/CodifAnnexe.php
- library/Class/IntBib.php 6 additions, 1 deletionlibrary/Class/IntBib.php
- library/Class/MoteurRecherche/Facettes.php 2 additions, 2 deletionslibrary/Class/MoteurRecherche/Facettes.php
- library/Class/Profil.php 11 additions, 0 deletionslibrary/Class/Profil.php
- library/Class/ScriptLoader.php 16 additions, 16 deletionslibrary/Class/ScriptLoader.php
- library/Class/User/Settings.php 61 additions, 2 deletionslibrary/Class/User/Settings.php
- library/Class/Users.php 11 additions, 1 deletionlibrary/Class/Users.php
- library/Trait/Json.php 92 additions, 0 deletionslibrary/Trait/Json.php
- library/Trait/JsonDomain.php 47 additions, 0 deletionslibrary/Trait/JsonDomain.php
- library/Trait/JsonLibrary.php 62 additions, 0 deletionslibrary/Trait/JsonLibrary.php
- library/ZendAfi/Form/User/Settings.php 33 additions, 6 deletionslibrary/ZendAfi/Form/User/Settings.php
- library/ZendAfi/View/Helper/Bouton.php 1 addition, 0 deletionslibrary/ZendAfi/View/Helper/Bouton.php
- library/ZendAfi/View/Helper/TreeSelect.php 70 additions, 55 deletionslibrary/ZendAfi/View/Helper/TreeSelect.php
- public/admin/js/treeselect/treeselect.css 71 additions, 69 deletionspublic/admin/js/treeselect/treeselect.css
- public/admin/js/treeselect/treeselect.js 63 additions, 13 deletionspublic/admin/js/treeselect/treeselect.js
- tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php 105 additions, 1 deletion...modules/opac/controllers/AbonneControllerSettingsTest.php
Please register or sign in to comment