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

Commit 036d3782 authored 11 years ago by

Patrick Barroca

Downloads
- Plain Diff

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

parents eb691fb0 a7f92153

Branches

Tags

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

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

library/Class/Album.php 13 additions, 0 deletions

library/Class/Album.php
library/Class/WebService/OPDS/CatalogEntry.php 42 additions, 4 deletions

library/Class/WebService/OPDS/CatalogEntry.php
library/Class/WebService/OPDS/CatalogReader.php 20 additions, 3 deletions

library/Class/WebService/OPDS/CatalogReader.php
scripts/webservice_aloes.php 41 additions, 38 deletions

scripts/webservice_aloes.php
tests/application/modules/admin/controllers/OpdsControllerTest.php 113 additions, 0 deletions

...lication/modules/admin/controllers/OpdsControllerTest.php

with 229 additions and 45 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