Merge branch 'stable' into... (dc9cf3b3) · 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
dc9cf3b3

Commit dc9cf3b3 authored 8 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'stable' into...

Merge branch 'stable' into hotline#56365_les_titres_des_mails_des_newletters_sont_tronques_a_35_caracteres

parents 786eafae 458b6e60

Branches

Tags

4 merge requests!2334Master,!2109Master,!2108Hotline master,!2095Hotline#56365 les titres des mails des newletters sont tronques a 35 caracteres

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 7 additions, 0 deletions

VERSIONS
library/Class/LeKiosk/CasLink.php 1 addition, 1 deletion

library/Class/LeKiosk/CasLink.php
library/Class/LeKiosk/Link.php 2 additions, 2 deletions

library/Class/LeKiosk/Link.php
library/Class/WebService/SIGB/Nanook/PatronInfoReader.php 16 additions, 0 deletions

library/Class/WebService/SIGB/Nanook/PatronInfoReader.php
library/startup.php 1 addition, 1 deletion

library/startup.php
scripts/emacs/phafi-mode.el 1 addition, 1 deletion

scripts/emacs/phafi-mode.el
tests/application/modules/opac/controllers/ModulesControllerTest.php 3 additions, 2 deletions

...cation/modules/opac/controllers/ModulesControllerTest.php
tests/fixtures/NanookFixtures.php 8 additions, 1 deletion

tests/fixtures/NanookFixtures.php
tests/library/Class/LeKioskLinkTest.php 4 additions, 4 deletions

tests/library/Class/LeKioskLinkTest.php

with 43 additions and 12 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