Merge branch 'hotline_6.46' into 'master' (5311770b) · 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
5311770b

Commit 5311770b authored 10 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline_6.46' into 'master'

Hotline 6.46

parents 3c14f903 733f06e1

Branches

Tags

2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!228Dev#12992 Custom Fields

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.htaccess 1 addition, 1 deletion

.htaccess
VERSIONS 2542 additions, 2534 deletions

VERSIONS
library/Class/Reservation.php 0 additions, 5 deletions

library/Class/Reservation.php
library/Class/Systeme/PergameService.php 173 additions, 202 deletions

library/Class/Systeme/PergameService.php
library/Class/TimeSource.php 5 additions, 0 deletions

library/Class/TimeSource.php
library/Class/Transaction.php 27 additions, 0 deletions

library/Class/Transaction.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/library/Class/Systeme/PergameServiceTest.php 268 additions, 10 deletions

tests/library/Class/Systeme/PergameServiceTest.php

with 3017 additions and 2753 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