Merge branch 'hotline'
Conflicts: library/Class/WebService/Lastfm.php
Branches
Tags
Showing
- VERSIONS 21 additions, 0 deletionsVERSIONS
- application/modules/admin/views/scripts/harvest/jamendo-browse.phtml 0 additions, 3 deletions.../modules/admin/views/scripts/harvest/jamendo-browse.phtml
- application/modules/opac/controllers/AuthController.php 1 addition, 2 deletionsapplication/modules/opac/controllers/AuthController.php
- cosmogramme/VERSIONS_HOTLINE/82630 1 addition, 0 deletionscosmogramme/VERSIONS_HOTLINE/82630
- cosmogramme/VERSIONS_HOTLINE/94887 1 addition, 0 deletionscosmogramme/VERSIONS_HOTLINE/94887
- cosmogramme/sql/patch/patch_375.php 6 additions, 0 deletionscosmogramme/sql/patch/patch_375.php
- cosmogramme/tests/php/classes/KohaRecordIntegrationTest.php 59 additions, 4 deletionscosmogramme/tests/php/classes/KohaRecordIntegrationTest.php
- cosmogramme/tests/php/classes/ModelTestCase.php 1 addition, 1 deletioncosmogramme/tests/php/classes/ModelTestCase.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 28 additions, 21 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- cosmogramme/tests/php/classes/unimarc_mementos.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_mementos.txt
- library/Class/AdminVar.php 15 additions, 4 deletionslibrary/Class/AdminVar.php
- library/Class/AdminVar/CiteDeLaMusique.php 16 additions, 1 deletionlibrary/Class/AdminVar/CiteDeLaMusique.php
- library/Class/Calendar.php 5 additions, 0 deletionslibrary/Class/Calendar.php
- library/Class/IntBib.php 3 additions, 1 deletionlibrary/Class/IntBib.php
- library/Class/Notice/DoubleFinder.php 26 additions, 12 deletionslibrary/Class/Notice/DoubleFinder.php
- library/Class/Systeme/ModulesMenu/CiteDeLaMusique.php 1 addition, 2 deletionslibrary/Class/Systeme/ModulesMenu/CiteDeLaMusique.php
- library/Class/User/Registration.php 118 additions, 0 deletionslibrary/Class/User/Registration.php
- library/Class/Users.php 10 additions, 98 deletionslibrary/Class/Users.php
- library/Class/WebService/Lastfm.php 1 addition, 0 deletionslibrary/Class/WebService/Lastfm.php
- library/Class/WebService/SIGB/Carthame/AccountResponseReader.php 8 additions, 0 deletions.../Class/WebService/SIGB/Carthame/AccountResponseReader.php
Please register or sign in to comment