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

Revision #97

Merged
merged 37 commits into from
Oct 31, 2023
Merged

Revision #97

merged 37 commits into from
Oct 31, 2023

Commits on Oct 9, 2023

  1. stress subjectivity, discuss severity

    @aaronpeikert
    aaronpeikert committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    ccf391c View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. note that the calculus is there to balance the tradeoff

    @aaronpeikert
    aaronpeikert committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    41f34d2 View commit details
    Browse the repository at this point in the history

  2. minimally expand discussion

    @aaronpeikert
    aaronpeikert committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    8f7b120 View commit details
    Browse the repository at this point in the history

  3. mention the case of null as research hypothesis 

    closes #96
    @aaronpeikert
    aaronpeikert committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    24af0ad View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. fix typo

    @aaronpeikert
    aaronpeikert committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    df26c68 View commit details
    Browse the repository at this point in the history

  2. typo

    @aaronpeikert
    aaronpeikert committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    6bec0ac View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. add more examples to relate better to exploration, p hacking, and so … 

    …forth
    @aaronpeikert
    aaronpeikert committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    cf06082 View commit details
    Browse the repository at this point in the history

  2. small changes after reading

    @aaronpeikert
    aaronpeikert committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    edb0dcc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. add more references to the exploration confirmation dichotomy

    @aaronpeikert
    aaronpeikert committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    e00ab2d View commit details
    Browse the repository at this point in the history

  2. add more references on deviations after preregistration

    @aaronpeikert
    aaronpeikert committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    13b2bc6 View commit details
    Browse the repository at this point in the history

  3. run automate

    @aaronpeikert
    aaronpeikert committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    63f326e View commit details
    Browse the repository at this point in the history

  4. cite computational reproducibility

    @aaronpeikert
    aaronpeikert committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    c4d5fd8 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2023

  1. cite diagnosticity

    @aaronpeikert
    aaronpeikert committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    1646619 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. cite measures

    @aaronpeikert
    aaronpeikert committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    9bc6196 View commit details
    Browse the repository at this point in the history

  2. extend discussion of oberauer

    @aaronpeikert
    aaronpeikert committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    9aeb1a1 View commit details
    Browse the repository at this point in the history

  3. found smallish errors

    @aaronpeikert
    aaronpeikert committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    1a39e4a View commit details
    Browse the repository at this point in the history

  4. remove psych methods submission

    @aaronpeikert
    aaronpeikert committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    89e16ae View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. add declaration for submission

    @aaronpeikert
    aaronpeikert committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    1efcb0f View commit details
    Browse the repository at this point in the history

  2. take same affiliation as in software evaluation

    @aaronpeikert
    aaronpeikert committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    3f59238 View commit details
    Browse the repository at this point in the history

  3. Update manuscript.Rmd 

    I don't think that we need to be explicit about the previous rejection, particularly because the current manuscript is not the version that was rejected anymore.
    @brandmaier
    brandmaier committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    aa5df9c View commit details
    Browse the repository at this point in the history

  4. Update manuscript.Rmd

    @brandmaier
    brandmaier committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    60ab9a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Apply andreas' suggestions 

    Co-authored-by: Andreas Brandmaier <brandmaier@mpib-berlin.mpg.de>
    @aaronpeikert @brandmaier
    aaronpeikert and brandmaier committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    2a9a2e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. commit obvious improvements 

    Co-authored-by: Andreas Brandmaier <brandmaier@mpib-berlin.mpg.de>
    @aaronpeikert @brandmaier
    aaronpeikert and brandmaier committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    b87358d View commit details
    Browse the repository at this point in the history

  2. Update manuscript.Rmd

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    fdfb84d View commit details
    Browse the repository at this point in the history

  3. cite streamlined p hacking

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    083d2ab View commit details
    Browse the repository at this point in the history

  4. cite HARKing properly

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    8729e23 View commit details
    Browse the repository at this point in the history

  5. Update manuscript.Rmd

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    38f014c View commit details
    Browse the repository at this point in the history

  6. put figs into manuscript

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    10e6a58 View commit details
    Browse the repository at this point in the history

  7. update wordcount

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    06d9294 View commit details
    Browse the repository at this point in the history

  8. cite the defeatist perspective

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    9ca3b21 View commit details
    Browse the repository at this point in the history

  9. cite höfler

    @aaronpeikert
    aaronpeikert committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    6b8df02 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Apply suggestions from maximilian 

    Co-authored-by: Maximilian-Stefan-Ernst <34346372+Maximilian-Stefan-Ernst@users.noreply.github.com>
    @aaronpeikert @Maximilian-Stefan-Ernst
    aaronpeikert and Maximilian-Stefan-Ernst committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    e4fa1ce View commit details
    Browse the repository at this point in the history

  2. Merge pull request #98 from aaronpeikert/affiliation 

    same affiliation as in software evaluation?
    @aaronpeikert
    aaronpeikert committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    e439211 View commit details
    Browse the repository at this point in the history

  3. cite deviation paper

    @aaronpeikert
    aaronpeikert committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    296e352 View commit details
    Browse the repository at this point in the history

  4. cite fiedler again

    @aaronpeikert
    aaronpeikert committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    f480b16 View commit details
    Browse the repository at this point in the history

  5. add sem trees

    @aaronpeikert
    aaronpeikert committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    2508262 View commit details
    Browse the repository at this point in the history

  6. add last minute suggestions 

    Co-authored-by: Andreas Brandmaier <brandmaier@mpib-berlin.mpg.de>
Co-authored-by: Maximilian-Stefan-Ernst <34346372+Maximilian-Stefan-Ernst@users.noreply.github.com>
    @aaronpeikert @brandmaier @Maximilian-Stefan-Ernst
    3 people committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    8e55525 View commit details
    Browse the repository at this point in the history