Merge branch 'hotline_6.54' into 'master' (e0ddf25b) · 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
e0ddf25b

Commit e0ddf25b authored 10 years ago by

Patrick Barroca

Downloads
- Plain Diff

Merge branch 'hotline_6.54' into 'master'

Hotline 6.54

See merge request !489

parents a9b662a5 7b73b3b7

Branches

Tags 8.0.92

4 merge requests!529Hotline 6.56,!512Master,!500Hotline 6.55,!490Master

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 8 additions, 0 deletions

VERSIONS
application/modules/admin/controllers/CmsController.php 46 additions, 16 deletions

application/modules/admin/controllers/CmsController.php
cosmogramme/java_script/main.js 1 addition, 1 deletion

cosmogramme/java_script/main.js
library/Class/AdminVar.php 11 additions, 0 deletions

library/Class/AdminVar.php
library/Class/Article.php 7 additions, 0 deletions

library/Class/Article.php
library/ZendAfi/View/Helper/Accueil/Sito.php 8 additions, 16 deletions

library/ZendAfi/View/Helper/Accueil/Sito.php
library/startup.php 1 addition, 1 deletion

library/startup.php
tests/application/modules/admin/controllers/CmsControllerTest.php 30 additions, 6 deletions

...plication/modules/admin/controllers/CmsControllerTest.php

with 112 additions and 40 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