Merge remote-tracking branch... (35b2045f) · 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
35b2045f

Commit 35b2045f authored 10 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/afi/hotline_16358_fix_update_notice_cosmogramme' into afi-hotline_6.52

Conflicts:
	VERSIONS

parents 14ffd504 f9af2f1e

Branches

Tags

3 merge requests!529Hotline 6.56,!425Dev#16320 loire forez skin,!421Hotline 6.52

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 2 additions, 0 deletions

VERSIONS
cosmogramme/php/classes/classe_notice_integration.php 82 additions, 63 deletions

cosmogramme/php/classes/classe_notice_integration.php
cosmogramme/php/classes/classe_profil_donnees.php 11 additions, 1 deletion

cosmogramme/php/classes/classe_profil_donnees.php
cosmogramme/php/classes/classe_unimarc.php 3 additions, 4 deletions

cosmogramme/php/classes/classe_unimarc.php
cosmogramme/tests/php/classes/NoticeIntegrationTest.php 123 additions, 12 deletions

cosmogramme/tests/php/classes/NoticeIntegrationTest.php
cosmogramme/tests/php/classes/unimarc_koha_okapi.txt 1 addition, 0 deletions

cosmogramme/tests/php/classes/unimarc_koha_okapi.txt
cosmogramme/tests/php/classes/unimarc_symphonie.txt 1 addition, 0 deletions

cosmogramme/tests/php/classes/unimarc_symphonie.txt
library/Class/IntProfilDonnees.php 123 additions, 80 deletions

library/Class/IntProfilDonnees.php

with 346 additions and 160 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