Merge branch 'hotline#36324_numeric_ressources_in_embed_mode' into 'stable' (2e0af791) · 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
2e0af791

Commit 2e0af791 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'hotline#36324_numeric_ressources_in_embed_mode' into 'stable'

Hotline#36324 numeric ressources in embed mode

See merge request !1421

parents a5adfcf7 3f26d180

Branches

Tags

7 merge requests!1553Master,!1502Master,!1501Stable,!1472Stable,!1428Master,!1427Hotline master,!1426Stable

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/36324 1 addition, 0 deletions

VERSIONS_HOTLINE/36324
application/modules/telephone/controllers/RechercheController.php 36 additions, 21 deletions

...ion/modules/telephone/controllers/RechercheController.php
application/modules/telephone/views/scripts/recherche/ressourcesnumeriques.phtml 5 additions, 8 deletions

...ephone/views/scripts/recherche/ressourcesnumeriques.phtml
library/Class/Notice.php 3 additions, 0 deletions

library/Class/Notice.php
library/ZendAfi/View/Helper/Telephone/RenderAlbum.php 11 additions, 3 deletions

library/ZendAfi/View/Helper/Telephone/RenderAlbum.php
tests/application/modules/telephone/controllers/RechercheControllerRessourceNumeriqueTest.php 37 additions, 5 deletions

...controllers/RechercheControllerRessourceNumeriqueTest.php

with 93 additions and 37 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