Merge remote-tracking branch 'refs/remotes/origin/stable' into hotline-master (8992b916) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

afi
opacce
Commits
8992b916

There was a problem fetching the pipeline stages.

Commit 8992b916 authored 8 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/stable' into hotline-master

# Conflicts:
#	library/ZendAfi/View/Helper/Abonne/Loans.php
#	library/ZendAfi/View/Helper/Abonne/ReservationsTable.php

parents 224eddf5 3a16f61b

Branches

Tags

2 merge requests!2080Sandbox detach zf from storm,!2061Master

Pipeline #230 passed with stage

in 10 minutes and 8 seconds

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

application/modules/opac/views/scripts/abonne/prets.phtml 1 addition, 1 deletion

application/modules/opac/views/scripts/abonne/prets.phtml
cosmogramme/VERSIONS_HOTLINE/36347 1 addition, 0 deletions

cosmogramme/VERSIONS_HOTLINE/36347
library/Class/Loan/Pnb.php 5 additions, 0 deletions

library/Class/Loan/Pnb.php
library/ZendAfi/View/Helper/Abonne/Loans.php 24 additions, 12 deletions

library/ZendAfi/View/Helper/Abonne/Loans.php
library/ZendAfi/View/Helper/Abonne/LoansPNB.php 63 additions, 0 deletions

library/ZendAfi/View/Helper/Abonne/LoansPNB.php
library/ZendAfi/View/Helper/Abonne/ReservationsTable.php 5 additions, 0 deletions

library/ZendAfi/View/Helper/Abonne/ReservationsTable.php
tests/application/modules/opac/controllers/AbonneControllerPretsTest.php 25 additions, 6 deletions

...on/modules/opac/controllers/AbonneControllerPretsTest.php

with 124 additions and 19 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment