Merge branch 'dev-togetherjs' into 'master' (806460f1) · 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
806460f1

Commit 806460f1 authored 11 years ago by

Meusburger

Downloads
- Plain Diff

Merge branch 'dev-togetherjs' into 'master'

Dev Togetherjs

parents efaed120 aa3b9b44

2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!24Hotline Dev Batch Index Numeric Ressources

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

library/Class/AdminVar.php 1 addition, 0 deletions

library/Class/AdminVar.php
library/ZendAfi/Controller/Plugin/TogetherJS.php 36 additions, 0 deletions

library/ZendAfi/Controller/Plugin/TogetherJS.php
library/startup.php 326 additions, 325 deletions

library/startup.php
scripts/emacs/phafi-mode.el 1 addition, 0 deletions

scripts/emacs/phafi-mode.el
tests/application/modules/opac/controllers/TogetherJSTest.php 88 additions, 0 deletions

...s/application/modules/opac/controllers/TogetherJSTest.php
tests/bootstrap_frontcontroller.php 2 additions, 1 deletion

tests/bootstrap_frontcontroller.php

with 454 additions and 326 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