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

ajs journal included #437

Merged
merged 15 commits into from
Sep 9, 2021
Merged

ajs journal included #437

merged 15 commits into from
Sep 9, 2021

Commits on Sep 7, 2021

  1. ajs journal included

    matthias-da committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    53ad4e4 View commit details
    Browse the repository at this point in the history

  2. Fix DESCRIPTION merge conflict 

    Merge commit '715ead77f930272044991d8bc6ce31c016d51d42'

Conflicts:
	DESCRIPTION
    @cderv
    cderv committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    d813478 View commit details
    Browse the repository at this point in the history

  3. Functions from article.R should not be deleted

    @cderv
    cderv committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    bcabf1f View commit details
    Browse the repository at this point in the history

  4. Fix also namespace and doc

    @cderv
    cderv committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    6d7862e View commit details
    Browse the repository at this point in the history

  5. fix NEWS.md too 

    [skip ci]
    @cderv
    cderv committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    c31d869 View commit details
    Browse the repository at this point in the history

  6. fix test file too

    @cderv
    cderv committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    371a555 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2021

  1. ajs_article() is a wrapper around jss_article()

    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    89fa083 View commit details
    Browse the repository at this point in the history

  2. Bump version

    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    8b1c7fc View commit details
    Browse the repository at this point in the history

  3. Rebuild README

    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    906c262 View commit details
    Browse the repository at this point in the history

  4. Add info in table 

    [skip ci]
    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    32a7e11 View commit details
    Browse the repository at this point in the history

  5. Fix README

    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    3090320 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into matthias-da-ajs

    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    8db10cb View commit details
    Browse the repository at this point in the history

  7. Update Template menu name 

    [skip ci]
    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    afffcea View commit details
    Browse the repository at this point in the history

  8. typo

    @cderv
    cderv committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    f631e8b View commit details
    Browse the repository at this point in the history

  9. Apply suggestions from code review

    @cderv
    cderv authored Sep 9, 2021
    Configuration menu
    Copy the full SHA
    3efeb5a View commit details
    Browse the repository at this point in the history