Merge branch 'master' into refacto-menu-horizontal (f88acb8d) · 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
f88acb8d

Commit f88acb8d authored 11 years ago by

llaffont

Downloads
- Plain Diff

Merge branch 'master' into refacto-menu-horizontal

parents bf5a07e2 78e113e0

Branches

Tags

2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!6Refacto Menu Horizontal

Changes 10

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
public/admin/images/picto/domaines_16.png 0 additions, 0 deletions

public/admin/images/picto/domaines_16.png
public/admin/images/picto/domaines_48.png 0 additions, 0 deletions

public/admin/images/picto/domaines_48.png
public/captcha/.gitignore 0 additions, 0 deletions

public/captcha/.gitignore
scripts/emacs/phafi-mode.el 23 additions, 9 deletions

scripts/emacs/phafi-mode.el
scripts/emacs/phpunit.el 14 additions, 0 deletions

scripts/emacs/phpunit.el
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 266 additions and 54 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