Merge branch 'stable' (e3a448ba) · 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
e3a448ba

Commit e3a448ba authored 8 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'stable'

Conflicts:
	VERSIONS
	library/startup.php

parents 60610c63 3843b16e

Branches

Tags

1 merge request!2080Sandbox detach zf from storm

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 9 additions, 0 deletions

VERSIONS
VERSIONS_HOTLINE/43155 0 additions, 1 deletion

VERSIONS_HOTLINE/43155
VERSIONS_HOTLINE/51096 0 additions, 1 deletion

VERSIONS_HOTLINE/51096
application/modules/admin/controllers/StatController.php 2 additions, 4 deletions

application/modules/admin/controllers/StatController.php
application/modules/admin/views/scripts/stat/rechercheinfructueuse.phtml 27 additions, 39 deletions

...ules/admin/views/scripts/stat/rechercheinfructueuse.phtml
library/Class/Codification.php 3 additions, 0 deletions

library/Class/Codification.php
library/Class/MoteurRecherche.php 11 additions, 3 deletions

library/Class/MoteurRecherche.php
library/Class/StatsNotices.php 4 additions, 1 deletion

library/Class/StatsNotices.php
tests/application/modules/admin/controllers/StatControllerTest.php 33 additions, 0 deletions

...lication/modules/admin/controllers/StatControllerTest.php
tests/application/modules/opac/controllers/RechercheControllerTest.php 41 additions, 3 deletions

...tion/modules/opac/controllers/RechercheControllerTest.php

with 130 additions and 52 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