Merge branch 'hotline#35175_erreur_reservation' into 'hotline-master' (d7bbf405) · 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
d7bbf405

Commit d7bbf405 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'hotline#35175_erreur_reservation' into 'hotline-master'

Hotline#35175 erreur reservation

See merge request !1376

parents ff4a6eb1 0726d4bd

Branches

Tags

6 merge requests!1553Master,!1502Master,!1501Stable,!1472Stable,!1390Master,!1383Hotline master

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/35175 1 addition, 0 deletions

VERSIONS_HOTLINE/35175
application/modules/opac/controllers/AbonneController.php 1 addition, 0 deletions

application/modules/opac/controllers/AbonneController.php
application/modules/opac/views/scripts/abonne/reservations.phtml 1 addition, 1 deletion

...tion/modules/opac/views/scripts/abonne/reservations.phtml
library/Class/Users.php 1 addition, 1 deletion

library/Class/Users.php
library/Class/WebService/SIGB/AbstractService.php 2 additions, 2 deletions

library/Class/WebService/SIGB/AbstractService.php
library/Class/WebService/SIGB/Emprunteur.php 1 addition, 2 deletions

library/Class/WebService/SIGB/Emprunteur.php
library/Class/WebService/SIGB/Exemplaire.php 7 additions, 4 deletions

library/Class/WebService/SIGB/Exemplaire.php
tests/application/modules/opac/controllers/AbonneControllerPretsTest.php 7 additions, 1 deletion

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

with 21 additions and 11 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