Merge branch... (2c5a2596) · 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
2c5a2596

Commit 2c5a2596 authored 9 years ago by

efalcy

Downloads
- Plain Diff

Merge branch...

Merge branch 'hotline#27768_affichage_list_des_articles_le_filtre_ne_descend_pas_dans_les_souscategories' into hotline#27768_recursive_listviewmode_articles

parents 89b0a7fe c5206018

Branches

Tags

1 merge request!1187Hotline#27768 recursive listviewmode articles

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_HOTLINE/27768 4 additions, 0 deletions

VERSIONS_HOTLINE/27768
application/modules/admin/controllers/CmsController.php 5 additions, 0 deletions

application/modules/admin/controllers/CmsController.php
library/Class/Bib.php 10 additions, 0 deletions

library/Class/Bib.php
library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php 22 additions, 4 deletions

.../ZendAfi/Controller/Action/Helper/ArticleListViewMode.php
library/ZendAfi/View/Helper/Admin/ListViewMode.php 1 addition, 0 deletions

library/ZendAfi/View/Helper/Admin/ListViewMode.php
tests/application/modules/admin/controllers/CmsControllerListModeTest.php 74 additions, 7 deletions

...n/modules/admin/controllers/CmsControllerListModeTest.php

with 116 additions and 11 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