Merge branch 'master' into 'hotline'
# Conflicts: # tests/scenarios/Templates/TemplatesAgendaTest.php
Branches
Tags
Showing
- FEATURES/104332 10 additions, 0 deletionsFEATURES/104332
- FEATURES/116562 10 additions, 0 deletionsFEATURES/116562
- FEATURES/125727 10 additions, 0 deletionsFEATURES/125727
- VERSIONS_WIP/104332 1 addition, 0 deletionsVERSIONS_WIP/104332
- VERSIONS_WIP/116562 1 addition, 0 deletionsVERSIONS_WIP/116562
- VERSIONS_WIP/124826 1 addition, 0 deletionsVERSIONS_WIP/124826
- VERSIONS_WIP/125727 1 addition, 0 deletionsVERSIONS_WIP/125727
- application/modules/admin/controllers/SessionActivityController.php 5 additions, 13 deletions...n/modules/admin/controllers/SessionActivityController.php
- cosmogramme/sql/patch/patch_396.php 19 additions, 0 deletionscosmogramme/sql/patch/patch_396.php
- cosmogramme/tests/php/classes/KohaPeriodiquesTest.php 1 addition, 1 deletioncosmogramme/tests/php/classes/KohaPeriodiquesTest.php
- cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php 2 additions, 2 deletionscosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 1 addition, 1 deletioncosmogramme/tests/php/classes/NoticeIntegrationTest.php
- library/Class/AdminVar.php 13 additions, 2 deletionslibrary/Class/AdminVar.php
- library/Class/AdminVar/PelliculeSettings.php 90 additions, 0 deletionslibrary/Class/AdminVar/PelliculeSettings.php
- library/Class/Album/Item.php 14 additions, 0 deletionslibrary/Class/Album/Item.php
- library/Class/Batch.php 1 addition, 0 deletionslibrary/Class/Batch.php
- library/Class/Batch/ActivitiesNotifications.php 45 additions, 0 deletionslibrary/Class/Batch/ActivitiesNotifications.php
- library/Class/Catalogue.php 1 addition, 1 deletionlibrary/Class/Catalogue.php
- library/Class/CodifThesaurus.php 41 additions, 9 deletionslibrary/Class/CodifThesaurus.php
- library/Class/CodifThesaurusFixed.php 1 addition, 0 deletionslibrary/Class/CodifThesaurusFixed.php
Please register or sign in to comment