Merge branch 'origin-stable' into origin-hotline-master (e5200c17) · 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
e5200c17

Commit e5200c17 authored 8 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'origin-stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php

parents 120d5d03 d74489cb

Branches

Tags

1 merge request!1896Master

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 2 additions, 0 deletions

VERSIONS
application/modules/opac/controllers/NoticeajaxController.php 4 additions, 0 deletions

...ication/modules/opac/controllers/NoticeajaxController.php
application/modules/opac/views/scripts/portail.phtml 1 addition, 1 deletion

application/modules/opac/views/scripts/portail.phtml
index.php 2 additions, 1 deletion

index.php
library/Class/UserAgent.php 86 additions, 0 deletions

library/Class/UserAgent.php
library/ZendAfi/Controller/Action/Helper/ViewRenderer.php 1 addition, 1 deletion

library/ZendAfi/Controller/Action/Helper/ViewRenderer.php
library/ZendAfi/Controller/Plugin/DefineURLs.php 3 additions, 1 deletion

library/ZendAfi/Controller/Plugin/DefineURLs.php
library/fonctions/fonctions.php 0 additions, 1 deletion

library/fonctions/fonctions.php
tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 27 additions, 0 deletions

...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
tests/library/fonctions/UserAgentTest.php 16 additions, 16 deletions

tests/library/fonctions/UserAgentTest.php

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