Merge branch 'afi-master' into multiple-skin-dirs (8faa02d2) · 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
8faa02d2

Commit 8faa02d2 authored 11 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'afi-master' into multiple-skin-dirs

parents 64d2f529 e0ce4e5d

Branches

Tags

2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!7Multiple Skin Dirs

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

application/modules/opac/controllers/SocialNetworkController.php 5 additions, 6 deletions

...tion/modules/opac/controllers/SocialNetworkController.php
library/ZendAfi/View/Helper/ReseauxSociaux.php 3 additions, 5 deletions

library/ZendAfi/View/Helper/ReseauxSociaux.php
library/ZendAfi/View/Helper/ShareUrl.php 3 additions, 11 deletions

library/ZendAfi/View/Helper/ShareUrl.php
tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php 2 additions, 2 deletions

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

...tion/modules/opac/controllers/RechercheControllerTest.php
tests/application/modules/opac/controllers/SocialNetworkControllerTest.php 13 additions, 7 deletions

.../modules/opac/controllers/SocialNetworkControllerTest.php
tests/library/ZendAfi/View/Helper/ShareUrlTest.php 15 additions, 11 deletions

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

with 43 additions and 44 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