Merge branch... (a280ae19) · 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
a280ae19

Commit a280ae19 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch...

Merge branch 'hotline#39847_telechargement_des_docs_pnb_depuis_un_smartphone_ko' into 'hotline-master'

Hotline#39847 telechargement des docs pnb depuis un smartphone ko

See merge request !1658

parents e8dd62db f0b1a6ab

3 merge requests!1677Hotline master,!1669Master,!1668Hotline master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/39847 1 addition, 0 deletions

VERSIONS_HOTLINE/39847
application/modules/telephone/controllers/RechercheController.php 1 addition, 1 deletion

...ion/modules/telephone/controllers/RechercheController.php
application/modules/telephone/views/scripts/abonne/fiche.phtml 13 additions, 34 deletions

...cation/modules/telephone/views/scripts/abonne/fiche.phtml
library/Class/Notice.php 6 additions, 0 deletions

library/Class/Notice.php
library/ZendAfi/View/Helper/Telephone/Abonne/Loans.php 98 additions, 0 deletions

library/ZendAfi/View/Helper/Telephone/Abonne/Loans.php
tests/application/modules/telephone/controllers/AbonneControllerTest.php 83 additions, 14 deletions

...on/modules/telephone/controllers/AbonneControllerTest.php
tests/application/modules/telephone/controllers/RechercheControllerRessourceNumeriqueTest.php 2 additions, 2 deletions

...controllers/RechercheControllerRessourceNumeriqueTest.php

with 204 additions and 51 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