Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/origin/dev#79898_bonuscontractuel_dilicom_prise_en_compte_de_la_drm_lcp_mercredi_1410' # Conflicts: # cosmogramme/sql/patch/patch_397.php # library/Class/AdminVar.php # library/templates/Intonation/View/RenderAjax.php # tests/db/UpgradeDBTest.php # tests/scenarios/PnbDilicom/PnbDilicomTest.php # tests/scenarios/Templates/TemplatesRecordsTest.php
Branches
Tags
Showing
- FEATURES/79898 10 additions, 0 deletionsFEATURES/79898
- VERSIONS_WIP/79898 1 addition, 0 deletionsVERSIONS_WIP/79898
- application/modules/opac/controllers/BibNumeriqueController.php 68 additions, 3 deletions...ation/modules/opac/controllers/BibNumeriqueController.php
- application/modules/opac/views/scripts/bib-numerique/loan-book.phtml 5 additions, 12 deletions.../modules/opac/views/scripts/bib-numerique/loan-book.phtml
- cosmogramme/sql/patch/patch_398.php 10 additions, 0 deletionscosmogramme/sql/patch/patch_398.php
- library/Class/AdminVar.php 4 additions, 2 deletionslibrary/Class/AdminVar.php
- library/Class/Loan/Pnb.php 16 additions, 1 deletionlibrary/Class/Loan/Pnb.php
- library/Class/Profil/Preferences/Loans.php 14 additions, 2 deletionslibrary/Class/Profil/Preferences/Loans.php
- library/Class/WebService/BibNumerique/Dilicom/Hub.php 124 additions, 25 deletionslibrary/Class/WebService/BibNumerique/Dilicom/Hub.php
- library/ZendAfi/View/Helper/TagDilicomWidget.php 3 additions, 3 deletionslibrary/ZendAfi/View/Helper/TagDilicomWidget.php
- library/templates/Intonation/Library/View/Wrapper/PNBLoan.php 30 additions, 2 deletions...ary/templates/Intonation/Library/View/Wrapper/PNBLoan.php
- tests/application/modules/opac/controllers/AbonneControllerPretsTest.php 24 additions, 11 deletions...on/modules/opac/controllers/AbonneControllerPretsTest.php
- tests/db/UpgradeDBTest.php 17 additions, 1 deletiontests/db/UpgradeDBTest.php
- tests/scenarios/PnbDilicom/PnbDilicomAdminTest.php 821 additions, 0 deletionstests/scenarios/PnbDilicom/PnbDilicomAdminTest.php
- tests/scenarios/PnbDilicom/PnbDilicomDisplayTest.php 1628 additions, 0 deletionstests/scenarios/PnbDilicom/PnbDilicomDisplayTest.php
- tests/scenarios/PnbDilicom/PnbDilicomTest.php 164 additions, 2362 deletionstests/scenarios/PnbDilicom/PnbDilicomTest.php
- tests/scenarios/PnbDilicom/getuseragent.json 1 addition, 0 deletionstests/scenarios/PnbDilicom/getuseragent.json
- tests/scenarios/Templates/TemplatesAbonneTest.php 4 additions, 1 deletiontests/scenarios/Templates/TemplatesAbonneTest.php
Please register or sign in to comment