Merge branch 'dev#48678_afi_multimedia_ouvertures_des_postes_multimedia'
Conflicts: cosmogramme/sql/patch/patch_311.php tests/db/UpgradeDBTest.php
Showing
- VERSIONS_WIP/48678 1 addition, 0 deletionsVERSIONS_WIP/48678
- application/modules/admin/controllers/OuverturesController.php 66 additions, 29 deletions...cation/modules/admin/controllers/OuverturesController.php
- application/modules/admin/views/scripts/ouvertures/index.phtml 7 additions, 6 deletions...cation/modules/admin/views/scripts/ouvertures/index.phtml
- application/modules/opac/controllers/AbonneController.php 19 additions, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_311.php 1 addition, 1 deletioncosmogramme/sql/patch/patch_311.php
- cosmogramme/sql/patch/patch_312.php 6 additions, 0 deletionscosmogramme/sql/patch/patch_312.php
- library/Class/Bib.php 9 additions, 0 deletionslibrary/Class/Bib.php
- library/Class/Migration/SitoConfigMigration.php 1 addition, 45 deletionslibrary/Class/Migration/SitoConfigMigration.php
- library/Class/Multimedia/AuthenticateRequest.php 2 additions, 2 deletionslibrary/Class/Multimedia/AuthenticateRequest.php
- library/Class/Multimedia/Location.php 21 additions, 20 deletionslibrary/Class/Multimedia/Location.php
- library/Class/Multimedia/Opening.php 63 additions, 0 deletionslibrary/Class/Multimedia/Opening.php
- library/Class/Ouverture.php 48 additions, 2 deletionslibrary/Class/Ouverture.php
- library/Class/Ouverture/Visitor.php 14 additions, 1 deletionlibrary/Class/Ouverture/Visitor.php
- library/ZendAfi/Controller/Action.php 22 additions, 4 deletionslibrary/ZendAfi/Controller/Action.php
- library/ZendAfi/Controller/Action/RessourceDefinitions.php 26 additions, 4 deletionslibrary/ZendAfi/Controller/Action/RessourceDefinitions.php
- library/ZendAfi/View/Helper/Admin/Libraries.php 8 additions, 0 deletionslibrary/ZendAfi/View/Helper/Admin/Libraries.php
- library/ZendAfi/View/Helper/LibraryOpenings.php 3 additions, 100 deletionslibrary/ZendAfi/View/Helper/LibraryOpenings.php
- library/ZendAfi/View/Helper/LibraryOpeningsAdmin.php 119 additions, 0 deletionslibrary/ZendAfi/View/Helper/LibraryOpeningsAdmin.php
- public/admin/skins/bokeh72/config.json 2 additions, 1 deletionpublic/admin/skins/bokeh72/config.json
Please register or sign in to comment