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

(WIP) Story 145: Serve ad from heroku, not psiturk #425

Closed
wants to merge 8 commits into from
Closed

(WIP) Story 145: Serve ad from heroku, not psiturk #425

wants to merge 8 commits into from

Commits on Jan 18, 2017

  1. Test that loads ad server in initial state

    @MatthewWilkes
    MatthewWilkes committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    8451383 View commit details
    Browse the repository at this point in the history

  2. Log initial MTurk HIT info

    @MatthewWilkes
    MatthewWilkes committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    b781eab View commit details
    Browse the repository at this point in the history

  3. Pass recruitment info in /launch results 

    Instead of using subprocess to call curl, then subprocess to grep the server logs, make /launch return the relevant info for recruitment directly and call it with requests.
    @MatthewWilkes
    MatthewWilkes committed Jan 18, 2017
    1 Configuration menu
    Copy the full SHA
    9387044 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Get mode from the current config rather than request options

    @MatthewWilkes
    MatthewWilkes committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    41aa3ed View commit details
    Browse the repository at this point in the history

  2. Changes to dallinger.js to post to externalSubmit

    @MatthewWilkes
    MatthewWilkes committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    873a346 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2017

  1. Allow completing of tasks and returning to ad

    @MatthewWilkes
    MatthewWilkes committed Jan 21, 2017
    Configuration menu
    Copy the full SHA
    5100721 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2017

  1. Fixes

    @davisagli
    davisagli committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    25823ea View commit details
    Browse the repository at this point in the history

  2. Fix completing workers in debug mode

    @davisagli
    davisagli committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    c2e0d5b View commit details
    Browse the repository at this point in the history