https://github.com/NYUCCL/psiTurk

sort by:
Revision Author Date Message Commit Date
8464eaf bumping version 25 January 2017, 03:29:56 UTC
4fc0164 Merge pull request #255 from NYUCCL/173-import-gnureadline-if-available import gnureadline if available 24 January 2017, 01:14:41 UTC
427ead5 I don't pretend to be expert in mac enviornments, but explicitly importing gnureadline fixes broken things see #173 24 January 2017, 01:10:22 UTC
3273512 Merge pull request #253 from jacob-lee/master The methods get_trial_data, get_question_data and get_eventdata were not catching TypeError and ValueError exceptions as intended, causing data download in the psiturk shell to fail. The list of exception classes needs to be enclosed in parentheses. 05 January 2017, 02:28:09 UTC
a391711 Bug Fix The methods get_trial_data, get_question_data and get_eventdata were not catching TypeError and ValueError exceptions as intended due to a lack of parentheses surrounding the list of exceptions in the except clauses. 30 December 2016, 22:25:45 UTC
388b22c adding a `pub` alias for the `ad` route, to get around ad blockers. will need more work later to interface with the psiturk ad server 04 October 2016, 20:46:40 UTC
28593ff allowing psutil to be higher to fix an anaconda issue 06 September 2016, 03:28:24 UTC
22363f9 Merge pull request #249 from pmlandwehr/patch-1 Adding a reference to the LICENSE 06 September 2016, 03:26:40 UTC
8f534a0 bumpity-bump-bump 23 August 2016, 20:32:01 UTC
c375bfc bumping again for travis' sake 23 August 2016, 20:24:34 UTC
9bc9d85 Update version.py 23 August 2016, 20:18:23 UTC
1f7fbac updating travis yml config for pypi deploy hook 23 August 2016, 19:31:16 UTC
0723cbc Adding a reference to the LICENSE I've gone ahead and made a `conda` package out of this repo for distribution via the community-curated `conda-forge` channel. (If y'all want to help maintain it, that would be cool, but is unrelated.) We've started included links to license files in the conda builds themselves, but doing so requires that the license be in the manifest itself. If this pull gets incorporated into the next pypi version, that would let us include said link. 17 August 2016, 18:00:22 UTC
44e3836 Merge pull request #248 from NYUCCL/execute_one_cmd making it possible to execute just one command instead of having to r… 15 August 2016, 19:40:52 UTC
8182f74 making it possible to execute just one command instead of having to read in a script. this will facilitate batch-creating hits via `hit create`. 03 August 2016, 06:39:22 UTC
75c078e due to pypi problem just stepping minor version forward by one (sorry y'all!) 01 August 2016, 03:55:19 UTC
f9d5ce2 minor fix for pypi release 29 July 2016, 19:43:09 UTC
3827d9e preparing 2.1.3 release 28 July 2016, 18:36:18 UTC
792b8ab nuking container-ad strings (#245) see also 1f9d16e 14 July 2016, 21:20:21 UTC
d7d9eba Update thanks-mturksubmit.html making the error message more user-friendly. 13 July 2016, 17:53:55 UTC
178a21d Use own ad server (#226) * documenting the tab-complete functions * adding functionality for gunicorn ssl and for specifying one's own ad_location (instead of using the psiturk location) * printing the ad url and the mturk url, for both psiturk and non-psiturk ad_locations * no need to ask them twice if they're using an external server... * functionizes generate_hit_config and also create_psiturk_ad to make hit_create less bulky * Adding some documentation for the new [server parameter] and [shell parameter] SSL- and ad-server-related experimental features. Also I'm removing most of the inline documentation from the default local config.txt file. It seemed like it might have been overwhelming to newcomers. I moved it into the docs instead. * added important note to docs emphasizing that if the psiturk server is ssl-enabled, a proxy server must be used in front of it in order to serve static content. * warn before reloading on submit page if it hasn't finished submitting to mturk yet. 12 July 2016, 01:16:38 UTC
fb4b1fc Update retrieving.rst add `mode` to toplevel datastring 11 July 2016, 17:02:07 UTC
d16ecbe record mode and full useragent string (#240) this stashes the mode in the db (live, sandbox, debug). this can be helpful when doing analyses later down the line in case one needs to distinguish between live and sandbox assignments in the db. the mode is stored as part of the taskdata datastring also, this fixes a neighboring bug where the full useragent string wasn't actually being saved to the taskdata datastring by backbone 11 July 2016, 16:27:36 UTC
cb4eac3 Fixes #236 (#239) 11 July 2016, 16:26:59 UTC
1011093 add_bonus function searches db using uniqueid (#238) Closes #237 11 July 2016, 16:26:02 UTC
bbd9fc8 changing the error message for RDS connections for IAM users (#232) * changing the error message for RDS connections for IAM users December 2015 AWS enabled IAM access control for Mturk. This commit edits the error message to be DB-services specific. Right now it makes users think that their credentials aren't good for anything, but actually the message here is only triggered if RDB services can't be accessed. Other commits should maybe change other login messages too to be more specific, but this is a start. Sorry for the obscene length but at least the message is informative! see [this group thread](https://groups.google.com/forum/#!topic/psiturk/1nx8D-tsE74) * simplied the error message, and shunted some of the documentation load for this to the docs. Also linked to a description of using IAM with psiturk. * updating description for openshift and for the mysql description 11 July 2016, 16:24:40 UTC
6467abe task parameters doc update (#243) * Update task_parameters.rst with description of experiment_code_version and num_conds bug workaround. 11 July 2016, 14:39:56 UTC
e9c907f sync url update in comment 30 June 2016, 00:32:38 UTC
ab04063 Merge pull request #233 from deargle/openshift-mysql-db use openshift db cartridge, if one is installed 27 June 2016, 19:13:38 UTC
1f9d16e evading pesky adblockers on ad.html the commonly-used ad-blocking list on https://easylist.github.io/easylist/easylist.txt was recently updated to include 'container-ad', which blocks our entire psiturk ad container. changing our container id. see https://groups.google.com/forum/#!topic/psiturk/yzT-w7KZxms 27 June 2016, 14:07:56 UTC
cf89f8f typo 25 June 2016, 09:20:02 UTC
e362c04 use openshift db cartridge, if one is installed openshift will host mysql or postgresql relational DBs for you, if you add those cartridges. this commit tells db.py to use the first installed openshift db it finds. note that it is theoretically possible to have both postgresql and mysql addon cartridges installed at the same time. don't do that, that would be silly. No editing config.txt required -- the location of the openshift db can change, so relying on the env vars is really the best way to go. and it's not easy to integrate the env vars into config.txt. See README at https://github.com/deargle/openshift-psiturk-cartridge for an example of getting mysql up and running. 08 June 2016, 17:02:45 UTC
693e40b Merge pull request #231 from deargle/ctrl-c-kill-server notify user when ctrl-c kills experiment server 10 May 2016, 01:17:25 UTC
796c587 Merge pull request #230 from deargle/ctrl-c-new-line Ctrl+c creates a new line 10 May 2016, 01:16:50 UTC
e393d33 Merge pull request #209 from deargle/208-get-all-hits get_workers get all hits 10 May 2016, 01:16:07 UTC
e7063ff shameful self promotion 02 May 2016, 19:12:41 UTC
69a711d notify user when ctrl-c kills experiment server gunicorn's `on_exit` is hooked so that it can be called when the server is shut down via CTRL+C. Otherwise there is no notification to the user that the server has shut down until they hit `enter` and see that the cmdloop prompt suddenly says "server off" unfortunatley detection of ctrl+c can't be handled reliably by psiturk_shell even by checking `server.is_server_running()` because gunicorn shuts down its workers asynchronously and therefore status will sometimes be read before, during, or after everything has shutdown requires gunicorn >= 19.0 though (when the on_exit hook was implemented). Everything works with the most recent gunicorn (19.4.5) Closes #229 02 May 2016, 19:05:12 UTC
704046f this function doesn't actually create a blank line -- it is called by _after_ a blank line is submitted. 02 May 2016, 18:44:42 UTC
df80755 remove call to parent stub functions each of the removed calls were just stub hook functions in the parend module. no need to call them. 02 May 2016, 18:36:15 UTC
fa752a5 create newline on keyboard interrupt. `cmd2`'s `_cmdloop` only exits when `stop` internally evaluates to True. unless there has been a keyboardinterrupt. So if stop is False yet we got here then a keyboard interrupt happened. unfortunately we can't simply listen for a KeyboardInterrupt here because cmd2's `_cmdloop` eats exceptions with a `return` in a `finally` block. so we have to fall back on checking this stop value. we also have to use `_cmdloop()` instead of `cmdloop()` because `cmd2`. 02 May 2016, 18:24:24 UTC
51158ca Merge pull request #228 from deargle/script-no-kill-server this `atkill` handler does _not_ do what it claims. It claims to hand… 02 May 2016, 14:58:49 UTC
cffdae0 this `atkill` handler does _not_ do what it claims. It claims to handle keyboard interrupts but that is precisely what the module is designed to not do. what this codeblock _does_ do is kill the server whenever `psiturk -s` is invoked. That's bad. `psiturk -s` should shut down its own servers if that is what the user wants to do. other code already handles shutting down the server on invocation of `exit` or `server off`. this code simply has to go. 30 April 2016, 05:16:17 UTC
a3b9a8f Merge pull request #220 from adamliter/fix/219 Adds browser_exclude_rule for Safari 26 April 2016, 17:02:37 UTC
e3806cc Merge pull request #218 from NYUCCL/db-timeout-fix fixes "MySQL Server has gone away" error for long-term experiments 26 April 2016, 16:26:45 UTC
61961fc Merge pull request #224 from deargle/patch-2 Describe fractional duration functionality 26 April 2016, 16:19:46 UTC
4db23e0 Merge pull request #225 from deargle/patch-3 build docs in readthedocs theme 26 April 2016, 16:19:22 UTC
f61e477 Adds browser_exclude_rule for Safari This fixes #219. As disscussed in #219, Google Chrome userAgent strings include the word Safari. Because of this, trying to exclude Safari also excludes Google Chrome. The value for Safari userAgent strings just includes Safari and not Google Chrome. Therefore, this problem can be fixed by first checking if both "Chrome" and "Safari" are in the userAgent string. If this is true, then we do not want to exclude it, so we do nothing. If this check returns False, then we still want to check to see if "Safari" is in the userAgent string because that is what we want to exclude. If it is, then we exclude it. 22 April 2016, 20:52:02 UTC
a6777f9 build docs in readthedocs theme This makes the local build look just like things will look like 21 April 2016, 23:36:34 UTC
3ae6462 Describe fractional duration functionality Reflects fractional duration functionality introduced in #180. See also #137, #165. 21 April 2016, 03:29:16 UTC
418f098 Merge pull request #221 from deargle/patch-1 Fixing the readthedocs link to be an external link 18 April 2016, 18:34:48 UTC
e31484e to address #222: comment out imgmath extension from sphynx (build errors on readthedocs) 18 April 2016, 17:50:15 UTC
1a787b6 Merge pull request #223 from deargle/docs-external-survey Docs for how to integrate external survey tools such as Qualtrics 18 April 2016, 17:42:23 UTC
040409c the new page and its fine linkages 17 April 2016, 06:08:10 UTC
63cecba removing some problematic blank lines 17 April 2016, 06:08:10 UTC
87e0d3a pngmath is replaced by imgmath. imgmath and mathjax can't exist at the same time, or the docs won't build. Also, commenting out static_folder since it causes a warning. 17 April 2016, 06:08:10 UTC
a265c98 Making the readthedocs link an external link 14 April 2016, 08:36:39 UTC
b208d3f fixes "MySQL Server has gone away" error for long-term experiments MySQL defaults to closing connections that have been inactive for 8 hours, which will result in the “MySQL Server has gone away” error if you have a long-term, low-traffic experiment (e.g., if you want to leave a server up for a one-session-per-day experiment). Setting the pool_recycle=3600 flag in the create_engine call forces SQLAlchemy to hourly refresh DBAPI connections. 22 March 2016, 16:56:46 UTC
d9fd9fe Merge pull request #212 from jhamrick/default Generate a random debug string in default.html 08 March 2016, 15:24:48 UTC
3e3c571 Merge pull request #213 from jhamrick/errors Add descriptions for each of the errors 08 March 2016, 15:24:26 UTC
02db904 Update tests 29 February 2016, 02:05:21 UTC
252e02b Add some styling to the error page 29 February 2016, 01:55:31 UTC
0969b8b Add descriptions for each of the errors 29 February 2016, 01:47:05 UTC
e387b25 Lower indent level 29 February 2016, 01:11:34 UTC
c8d0c6e Generate a random debug string in default.html 29 February 2016, 01:09:36 UTC
c196b75 get_workers get all hits get_workers now called boto's get_all_hits(). One consequence of this edit is that hits returned are no longer sorted descending by creation date. this will change the order that the returned workers appear in 18 February 2016, 16:10:17 UTC
332a104 Merge pull request #205 from deargle/instruction-id-fix instructionsnav id and value fix 18 February 2016, 14:36:23 UTC
f007297 Merge pull request #206 from deargle/fix-instructions-js-button-binding change instructionsnav click handler from `.bind` to `.on` 18 February 2016, 14:36:04 UTC
36c0388 Merge pull request #207 from deargle/203-list-more-than-100-workers get_workers gets more than 100 workers/assignments 18 February 2016, 14:35:21 UTC
941fe44 get_workers gets more than 100 workers/assignments get_workers now counts the total number of results for a given hit, and then requests multiple pages of up to 100 assignemnts per page until all results are obtained. Note, however, that the code is currently still limited to returning workers from the first 20 hits. Fixes #203 18 February 2016, 07:23:09 UTC
d33928c change instructionsnav click handler from `.bind` to `.on` `.bind` (which was deprecated in jquery v1.7) can only attach handlers to matching elements that already exist in the DOM. `.on`, on the other hand, is dynamic and attaches to elements that may match in the future (and detaches from elements that stop matching). Changing to `.on` allows a class of 'continue' or 'previous' to be added to a button at a later time so that it can act as a forward button. `.on` needs to be anchored to a parent element that will receive the bubbled event. the parent element should ideally be as close to the targeted event elements as possible so decrease bubbling noise. i attached it to the parent .instructionsnav container. 16 February 2016, 17:20:39 UTC
018168a instructionsnav id and value fix The 'previous' button within the instructionsnav example template had the same id and value as the 'continue' button. 16 February 2016, 16:54:03 UTC
663c2fd Merge pull request #204 from adamliter/master Fixes typo (Enthough -> Enthought) 01 February 2016, 19:51:53 UTC
cbcac32 Fixes typo (Enthough -> Enthought) 01 February 2016, 18:20:55 UTC
e9ac869 suspect this is causing build issues 15 December 2015, 01:41:06 UTC
f2a6908 minor typo in a comment (debugging travis issues) 15 December 2015, 00:11:59 UTC
ac43338 merge problems 14 December 2015, 18:28:20 UTC
01d68c8 Merge remote-tracking branch 'origin/dev' 14 December 2015, 18:26:18 UTC
b3279e0 Merge pull request #187 from NYUCCL/allow_multiple_users ignore other users processes when checking server 14 December 2015, 18:24:49 UTC
376fed7 Merge branch 'suchow-master' 14 December 2015, 18:23:00 UTC
f4070b4 Merge branch 'master' of https://github.com/suchow/psiTurk into suchow-master # Conflicts: # psiturk/db.py # psiturk/models.py # psiturk/psiturk_shell.py 14 December 2015, 18:22:19 UTC
7d1b48b Added more exception handling to loading questionnaire data because it was null 14 December 2015, 18:12:01 UTC
9bc3802 Removed get_connections call for OpenShift 14 December 2015, 18:11:27 UTC
0cb9e47 Merge pull request #185 from pfeyz/dev add note about using 127.0.0.1 for mysql hostname 14 December 2015, 18:06:02 UTC
3bcdb84 Merge pull request #194 from amandayung/master update total HIT cost based on new fees 14 December 2015, 18:04:12 UTC
6da6f70 update version number 14 December 2015, 17:58:01 UTC
4af98f8 Merge remote-tracking branch 'origin/dev' Conflicts: THANKS.md doc/install.rst psiturk/experiment.py psiturk/version.py setup.py 14 December 2015, 17:53:56 UTC
e6c29df master is now dev 14 December 2015, 17:31:50 UTC
97df2db update total HIT cost based on new fees 12 August 2015, 18:18:06 UTC
b1e8452 Merge pull request #192 from pfeyz/master specify psutil dependency <= 2.2.1 27 July 2015, 22:15:33 UTC
d00d4c9 specify psutil dependency <= 2.2.1 27 July 2015, 15:13:00 UTC
86e90fe add note about using 127.0.0.1 for mysql hostname 21 June 2015, 20:27:22 UTC
e4e0964 ignore other users processes when checking server Currently, when checking the server psiTurk searches through ALL user's processes for psiturk server processes, and thus if a second user is running a psiturk server it will find these processes and try to communicate with them, causing an error. If psiturk only searches for the current user's processes, multiple users should be able to serve from the same server, as long as they use different ports. 16 June 2015, 18:51:35 UTC
4b6aa6f Remove unused imports 12 May 2015, 01:46:35 UTC
e3be99c Don't round to nearest hour 12 May 2015, 01:03:01 UTC
33fdc46 Subscribe to REST notifications of MTurk activity 12 May 2015, 01:00:37 UTC
6009476 Create a HIT type for new HITs 12 May 2015, 00:59:18 UTC
e724889 Add response groups to hit creation request 12 May 2015, 00:58:40 UTC
6f11cb7 Allow unlimited-length HTTP requests NYUCCL/psiTurk#180 12 May 2015, 00:56:08 UTC
6ee39cf Merge pull request #179 from RoyalTS/patch-6 fixed error message 08 April 2015, 23:00:24 UTC
620bdeb fixed error message 07 April 2015, 13:16:28 UTC
back to top