Merge remote-tracking branch 'origin/hotline-master' into origin-master (cc0a1ad9) · 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
cc0a1ad9

Commit cc0a1ad9 authored 8 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/hotline-master' into origin-master

parents 2cbd6a62 f86491b8

Branches

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS 9 additions, 0 deletions

VERSIONS
application/modules/admin/controllers/SessionFormationController.php 17 additions, 3 deletions

.../modules/admin/controllers/SessionFormationController.php
library/Class/Batch/BuildSiteMap.php 3 additions, 2 deletions

library/Class/Batch/BuildSiteMap.php
library/Class/SessionFormation.php 11 additions, 8 deletions

library/Class/SessionFormation.php
library/ZendAfi/Controller/Router/RewriteWithoutBaseUrl.php 8 additions, 4 deletions

library/ZendAfi/Controller/Router/RewriteWithoutBaseUrl.php
library/startup.php 1 addition, 1 deletion

library/startup.php
library/storm 1 addition, 1 deletion

library/storm
public/opac/js/responsive.js 3 additions, 3 deletions

public/opac/js/responsive.js
tests/application/modules/admin/controllers/FormationControllerTest.php 4 additions, 4 deletions

...ion/modules/admin/controllers/FormationControllerTest.php
tests/library/Class/BatchTest.php 4 additions, 1 deletion

tests/library/Class/BatchTest.php

with 61 additions and 27 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