Merge branch 'dev#39820_bonus_story_3_affichage_en_facette_affichage_en_cases_a_cocher'
Conflicts: library/Class/Bib.php
Showing
- VERSIONS_WIP/39487 1 addition, 0 deletionsVERSIONS_WIP/39487
- VERSIONS_WIP/39488 1 addition, 0 deletionsVERSIONS_WIP/39488
- VERSIONS_WIP/39820 1 addition, 0 deletionsVERSIONS_WIP/39820
- application/modules/admin/controllers/AccueilController.php 1 addition, 0 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/views/scripts/accueil/library.phtml 10 additions, 4 deletions...ication/modules/admin/views/scripts/accueil/library.phtml
- application/modules/opac/controllers/BibController.php 20 additions, 0 deletionsapplication/modules/opac/controllers/BibController.php
- application/modules/opac/controllers/CmsController.php 2 additions, 8 deletionsapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/views/scripts/bib/widget-page.phtml 3 additions, 0 deletionsapplication/modules/opac/views/scripts/bib/widget-page.phtml
- library/Class/Article.php 9 additions, 16 deletionslibrary/Class/Article.php
- library/Class/Calendar.php 18 additions, 2 deletionslibrary/Class/Calendar.php
- library/Class/FilterSettings.php 69 additions, 0 deletionslibrary/Class/FilterSettings.php
- library/Class/Systeme/ModulesAccueil/Library.php 90 additions, 5 deletionslibrary/Class/Systeme/ModulesAccueil/Library.php
- library/Trait/CustomFields.php 6 additions, 1 deletionlibrary/Trait/CustomFields.php
- library/ZendAfi/Controller/Action.php 13 additions, 0 deletionslibrary/ZendAfi/Controller/Action.php
- library/ZendAfi/Form/Configuration/LibraryWidget.php 73 additions, 8 deletionslibrary/ZendAfi/Form/Configuration/LibraryWidget.php
- library/ZendAfi/View/Helper/Accueil/Base.php 22 additions, 3 deletionslibrary/ZendAfi/View/Helper/Accueil/Base.php
- library/ZendAfi/View/Helper/Accueil/Calendar.php 1 addition, 1 deletionlibrary/ZendAfi/View/Helper/Accueil/Calendar.php
- library/ZendAfi/View/Helper/Accueil/Library.php 117 additions, 86 deletionslibrary/ZendAfi/View/Helper/Accueil/Library.php
- library/ZendAfi/View/Helper/Calendar/RenderFilters.php 0 additions, 211 deletionslibrary/ZendAfi/View/Helper/Calendar/RenderFilters.php
- library/ZendAfi/View/Helper/CalendarContent.php 36 additions, 1 deletionlibrary/ZendAfi/View/Helper/CalendarContent.php
Please register or sign in to comment