Merge branch 'stable'
Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 7 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/AlbumController.php 8 additions, 1 deletionapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/views/scripts/album/dilicom.phtml 18 additions, 7 deletionsapplication/modules/admin/views/scripts/album/dilicom.phtml
- application/modules/opac/controllers/CmsController.php 11 additions, 17 deletionsapplication/modules/opac/controllers/CmsController.php
- application/modules/opac/views/scripts/cms/article_partial.phtml 9 additions, 6 deletions...tion/modules/opac/views/scripts/cms/article_partial.phtml
- library/Class/Album.php 16 additions, 0 deletionslibrary/Class/Album.php
- library/Class/Album/Item.php 20 additions, 17 deletionslibrary/Class/Album/Item.php
- library/Class/Album/UsageConstraints.php 12 additions, 0 deletionslibrary/Class/Album/UsageConstraints.php
- library/Class/Article.php 13 additions, 2 deletionslibrary/Class/Article.php
- library/Class/CodifGenre.php 6 additions, 0 deletionslibrary/Class/CodifGenre.php
- library/Class/CodifSection.php 10 additions, 0 deletionslibrary/Class/CodifSection.php
- library/Class/Loan/Pnb.php 21 additions, 11 deletionslibrary/Class/Loan/Pnb.php
- library/Class/Systeme/ModulesMenu/News.php 29 additions, 22 deletionslibrary/Class/Systeme/ModulesMenu/News.php
- library/Class/TableDescription/PNBItems.php 38 additions, 5 deletionslibrary/Class/TableDescription/PNBItems.php
- library/Class/TableDescription/PNBItemsExport.php 45 additions, 0 deletionslibrary/Class/TableDescription/PNBItemsExport.php
- library/Class/TableDescription/PNBLoans.php 57 additions, 0 deletionslibrary/Class/TableDescription/PNBLoans.php
- library/Trait/AlbumDelegator.php 88 additions, 0 deletionslibrary/Trait/AlbumDelegator.php
- library/ZendAfi/Form/Configuration/Menu/News.php 16 additions, 7 deletionslibrary/ZendAfi/Form/Configuration/Menu/News.php
- library/ZendAfi/Form/Configuration/Widget/Tags.php 1 addition, 1 deletionlibrary/ZendAfi/Form/Configuration/Widget/Tags.php
- library/ZendAfi/View/Helper/Accueil/Tags.php 2 additions, 3 deletionslibrary/ZendAfi/View/Helper/Accueil/Tags.php
Please register or sign in to comment