Merge branch 'hotline-master' into 'master' (e4b555ec) · 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
e4b555ec

Commit e4b555ec authored 10 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline-master' into 'master'

Hotline master

See merge request !778

parents d3543990 42258491

Branches

Tags

2 merge requests!780Master,!779Master

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 9 additions, 0 deletions

VERSIONS
application/modules/opac/views/scripts/java/protoflow.phtml 1 addition, 1 deletion

application/modules/opac/views/scripts/java/protoflow.phtml
config.ini.default 12 additions, 17 deletions

config.ini.default
cosmogramme/tests/php/IntegrationTest.php 23 additions, 0 deletions

cosmogramme/tests/php/IntegrationTest.php
cosmogramme/tests/php/integrationTest.php 0 additions, 10 deletions

cosmogramme/tests/php/integrationTest.php
library/Class/AdminVar.php 1 addition, 3 deletions

library/Class/AdminVar.php
library/Class/Url.php 10 additions, 0 deletions

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

library/startup.php
tests/application/modules/opac/controllers/JavaControllerTest.php 1 addition, 1 deletion

...plication/modules/opac/controllers/JavaControllerTest.php

with 58 additions and 33 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