Merge branch 'hotline#12780' into 'hotline_6.40' (28d5de6b) · 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
28d5de6b

Commit 28d5de6b authored 11 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'hotline#12780' into 'hotline_6.40'

Hotline#12780

parents 3de18430 e426c85d

Branches

Tags

4 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!63Rf13038,!56Rf13038 Front,!34Hotline 6.40

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

application/modules/admin/controllers/ModoController.php 51 additions, 0 deletions

application/modules/admin/controllers/ModoController.php
application/modules/admin/views/scripts/modo/editavisnotice.phtml 2 additions, 0 deletions

...ion/modules/admin/views/scripts/modo/editavisnotice.phtml
library/ZendAfi/View/Helper/AvisBloc.php 1 addition, 1 deletion

library/ZendAfi/View/Helper/AvisBloc.php
tests/application/modules/admin/controllers/AdminAvisModerationControllerTest.php 152 additions, 88 deletions

...s/admin/controllers/AdminAvisModerationControllerTest.php

with 206 additions and 89 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