Merge branch 'dev_articles_order' into 'master' (6082c686) · 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
6082c686

Commit 6082c686 authored 9 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'dev_articles_order' into 'master'

Dev articles order

See merge request !916

parents 1da45f1f 11cde8c7

Branches

Tags

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

VERSIONS_WIP/25560 1 addition, 0 deletions

VERSIONS_WIP/25560
application/modules/admin/views/scripts/modules/_options_cms.phtml 27 additions, 27 deletions

...on/modules/admin/views/scripts/modules/_options_cms.phtml
library/Class/Article.php 18 additions, 7 deletions

library/Class/Article.php
library/ZendAfi/View/Helper/Admin/HelpLink.php 2 additions, 1 deletion

library/ZendAfi/View/Helper/Admin/HelpLink.php
tests/application/modules/admin/controllers/AccueilControllerCmsTest.php 7 additions, 0 deletions

...on/modules/admin/controllers/AccueilControllerCmsTest.php
tests/application/modules/admin/controllers/AccueilControllerTest.php 0 additions, 1 deletion

...ation/modules/admin/controllers/AccueilControllerTest.php
tests/library/Class/ArticleLoaderTest.php 10 additions, 0 deletions

tests/library/Class/ArticleLoaderTest.php

with 65 additions and 36 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