Merge remote-tracking branch 'refs/remotes/origin/master' into dev#14279_integrations_exemplaires (001dc165) · 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
001dc165

Commit 001dc165 authored 10 years ago by

Laurent

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/master' into dev#14279_integrations_exemplaires

Conflicts:
	VERSIONS

parents 3d3ea29a 959d9f6b

4 merge requests!366Master,!364Master,!344Dev/15524,!343Dev#14279 integrations exemplaires

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 7 additions, 1 deletion

VERSIONS
library/Class/AdminVar.php 11 additions, 10 deletions

library/Class/AdminVar.php
library/Class/NumilogLink.php 4 additions, 6 deletions

library/Class/NumilogLink.php
library/Class/Users.php 57 additions, 52 deletions

library/Class/Users.php
library/ZendAfi/View/Helper/RenderAlbum.php 8 additions, 5 deletions

library/ZendAfi/View/Helper/RenderAlbum.php
library/ZendAfi/View/Helper/TagCyberlibrisBook.php 42 additions, 0 deletions

library/ZendAfi/View/Helper/TagCyberlibrisBook.php
tests/application/modules/admin/controllers/AdminIndexControllerTest.php 10 additions, 5 deletions

...on/modules/admin/controllers/AdminIndexControllerTest.php
tests/library/ZendAfi/View/Helper/RenderAlbumTest.php 61 additions, 9 deletions

tests/library/ZendAfi/View/Helper/RenderAlbumTest.php

with 200 additions and 88 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