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

Commit b96e8b72 authored 9 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'stable' into hotline-master

parents f57239f2 bc0b7104

Branches

Tags

2 merge requests!896Master,!850Master

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/hotline_#18668_wikipedia_api 1 addition, 0 deletions

VERSIONS_HOTLINE/hotline_#18668_wikipedia_api
VERSIONS_STABLE/#24569 1 addition, 0 deletions

VERSIONS_STABLE/#24569
cosmogramme/php/_init.php 1 addition, 1 deletion

cosmogramme/php/_init.php
cosmogramme/sql/patch/patch_234.php 1 addition, 1 deletion

cosmogramme/sql/patch/patch_234.php
cosmogramme/sql/patch/patch_247.php 6 additions, 0 deletions

cosmogramme/sql/patch/patch_247.php
library/Class/WebService/AllServices.php 3 additions, 0 deletions

library/Class/WebService/AllServices.php
library/ZendAfi/View/Helper/Biographie.php 7 additions, 0 deletions

library/ZendAfi/View/Helper/Biographie.php
tests/application/modules/admin/controllers/UploadControllerTest.php 29 additions, 27 deletions

...cation/modules/admin/controllers/UploadControllerTest.php
tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 1 addition, 0 deletions

...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
tests/library/ZendAfi/View/Helper/BiographieTest.php 41 additions, 0 deletions

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

with 91 additions and 29 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