Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Feature items filter to mod_articles_news | Fix merge conficts for #11540 #12547

Merged
merged 5 commits into from
Nov 20, 2016
Merged

Added Feature items filter to mod_articles_news | Fix merge conficts for #11540 #12547

merged 5 commits into from
Nov 20, 2016

Commits on Aug 10, 2016

  1. Added Feature items filter to mod_articles_news 

    The feature item filter was already available for the
mod_articles_latest module, but that is just a list.
All code was slightly modified from the mod_articles_latest module.

Language File - Added three variables (description, lable and value)
Helper - Copy and pasted the switch from mod_articles_latest (same
parameter ordering too)
Parameter file - Added field after order (mirroring _latest)
    @nickyeoman
    nickyeoman committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    b0e6d3d View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2016

  1. merge conflicts

    @zero-24
    zero-24 committed Oct 16, 2016
    Configuration menu
    Copy the full SHA
    3f0dab5 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Merge branch 'staging' into 11540

    @zero-24
    zero-24 committed Nov 14, 2016
    Configuration menu
    Copy the full SHA
    2ef43b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2016

  1. Merge branch 'staging' into 11540

    @jeckodevelopment
    jeckodevelopment committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    5ae4b0f View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2016

  1. Merge branch 'staging' into 11540

    @zero-24
    zero-24 committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    19736f1 View commit details
    Browse the repository at this point in the history