Merge branch '6.39.2' (7c0891f7) · 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
7c0891f7

Commit 7c0891f7 authored 11 years ago by

llaffont

Downloads
- Plain Diff

Merge branch '6.39.2'

Conflicts:
	library/ZendAfi/View/Helper/RenderDomainBrowser.php

parents b84d72f6 77bc4aec

Branches

Tags

1 merge request!258Dev/13872 Orphee Allow Hold Available Items

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

library/ZendAfi/Controller/Plugin/SelectionBib.php 1 addition, 1 deletion

library/ZendAfi/Controller/Plugin/SelectionBib.php
library/ZendAfi/View/Helper/RenderDomainBrowser.php 51 additions, 41 deletions

library/ZendAfi/View/Helper/RenderDomainBrowser.php
public/opac/css/global.css 26 additions, 2 deletions

public/opac/css/global.css
tests/application/modules/opac/controllers/DomainsControllerTest.php 35 additions, 7 deletions

...cation/modules/opac/controllers/DomainsControllerTest.php
tests/application/modules/opac/controllers/RechercheControllerTest.php 2 additions, 2 deletions

...tion/modules/opac/controllers/RechercheControllerTest.php
tests/library/ZendAfi/View/Helper/Accueil/DomainBrowserTest.php 10 additions, 7 deletions

...library/ZendAfi/View/Helper/Accueil/DomainBrowserTest.php

with 125 additions and 60 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