Merge branch 'master' into 'dev#33757_gestion_des_preferences_de_l_utilisateur' (af2a1a15) · 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
af2a1a15

Commit af2a1a15 authored 9 years ago by

Ghislain Loas

Downloads
- Plain Diff

Merge branch 'master' into 'dev#33757_gestion_des_preferences_de_l_utilisateur'

Master

See merge request !1322

parents ee625811 fd9a5c66

Branches

Tags

4 merge requests!1553Master,!1502Master,!1501Stable,!1325Dev#33757 gestion des preferences de l utilisateur

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

library/Class/Article.php 5 additions, 2 deletions

library/Class/Article.php
library/ZendAfi/View/Helper/Calendar/Table.php 4 additions, 2 deletions

library/ZendAfi/View/Helper/Calendar/Table.php
library/ZendAfi/View/Helper/TagArticleEvent.php 1 addition, 1 deletion

library/ZendAfi/View/Helper/TagArticleEvent.php
tests/application/modules/admin/controllers/SystemeControllerWebServicesTest.php 2 additions, 0 deletions

...es/admin/controllers/SystemeControllerWebServicesTest.php
tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 1 addition, 0 deletions

...ion/modules/opac/controllers/NoticeAjaxControllerTest.php

with 13 additions and 5 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