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

Commit 1b2698ca authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php

parents 572a6403 251aa77b

Branches

Tags

7 merge requests!1587Master,!1553Master,!1519Master,!1506Master,!1502Master,!1500Master,!1499Hotline master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/37996 1 addition, 0 deletions

VERSIONS_HOTLINE/37996
application/modules/admin/controllers/PremierChapitreController.php 9 additions, 8 deletions

...n/modules/admin/controllers/PremierChapitreController.php
application/modules/admin/views/scripts/accueil/premier-chapitre.phtml 2 additions, 2 deletions

...odules/admin/views/scripts/accueil/premier-chapitre.phtml
application/modules/opac/controllers/PremierChapitreController.php 5 additions, 5 deletions

...on/modules/opac/controllers/PremierChapitreController.php
application/modules/opac/views/scripts/premier-chapitre/index.phtml 1 addition, 1 deletion

...n/modules/opac/views/scripts/premier-chapitre/index.phtml
library/ZendAfi/View/Helper/PremierChapitre/Lien.php 3 additions, 1 deletion

library/ZendAfi/View/Helper/PremierChapitre/Lien.php
library/ZendAfi/View/Helper/PremierChapitre/Vignettes.php 10 additions, 4 deletions

library/ZendAfi/View/Helper/PremierChapitre/Vignettes.php

with 31 additions and 21 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