Merge branch 'dev#25569_boite_sitotheque_afficher_les_derniers_sites_d_une_categorie' (614943a4) · 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
614943a4

Commit 614943a4 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'dev#25569_boite_sitotheque_afficher_les_derniers_sites_d_une_categorie'

Conflicts:
	tests/application/modules/opac/controllers/SitoControllerTest.php

parents 3f27e89a 5884b4d9

Branches

Tags

3 merge requests!1267Master,!1216Master,!1214Dev#5524 refounds as record block

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_WIP/25569 1 addition, 0 deletions

VERSIONS_WIP/25569
application/modules/admin/views/scripts/accueil/sitotheque.phtml 5 additions, 2 deletions

...tion/modules/admin/views/scripts/accueil/sitotheque.phtml
application/modules/opac/controllers/SitoController.php 9 additions, 8 deletions

application/modules/opac/controllers/SitoController.php
library/Class/Sitotheque.php 20 additions, 1 deletion

library/Class/Sitotheque.php
library/ZendAfi/View/Helper/Accueil/Sito.php 4 additions, 4 deletions

library/ZendAfi/View/Helper/Accueil/Sito.php
tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php 84 additions, 0 deletions

.../modules/opac/controllers/ProfilOptionsControllerTest.php
tests/application/modules/opac/controllers/SitoControllerTest.php 60 additions, 9 deletions

...plication/modules/opac/controllers/SitoControllerTest.php
tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php 2 additions, 2 deletions

tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php

with 185 additions and 26 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