Merge branch 'hotline#26954-flash-kiosk-prefs-lost' into 'stable' (00911407) · 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
00911407

Commit 00911407 authored 9 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline#26954-flash-kiosk-prefs-lost' into 'stable'

Hotline#26954 flash kiosk prefs lost

See merge request !972

parents 17802c69 a236c69d

3 merge requests!976Master,!975Hotline master,!974Stable

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_STABLE/26954 1 addition, 0 deletions

VERSIONS_STABLE/26954
application/modules/admin/controllers/AccueilController.php 9 additions, 31 deletions

application/modules/admin/controllers/AccueilController.php
library/Class/Systeme/ModulesAccueil/Calendrier.php 0 additions, 2 deletions

library/Class/Systeme/ModulesAccueil/Calendrier.php
library/Class/Systeme/ModulesAccueil/Kiosque.php 51 additions, 2 deletions

library/Class/Systeme/ModulesAccueil/Kiosque.php
library/Class/Systeme/ModulesAccueil/Null.php 10 additions, 8 deletions

library/Class/Systeme/ModulesAccueil/Null.php
tests/application/modules/admin/controllers/AccueilControllerTest.php 34 additions, 0 deletions

...ation/modules/admin/controllers/AccueilControllerTest.php
tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php 1 addition, 3 deletions

tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php

with 106 additions and 46 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