Skip to main content

Browse the archive

https://github.com/NYUCCL/psiTurk
17 July 2024, 18:01:53 UTC
sort by:
Revision Author Date Message Commit Date
cb187e2 Dave Eargle 15 March 2021, 23:42:08 UTC remove accidental tuples? 15 March 2021, 23:42:08 UTC
00f993e Dave Eargle 15 March 2021, 23:16:01 UTC bump version 15 March 2021, 23:16:01 UTC
b5a2b7d Dave Eargle 15 March 2021, 23:13:57 UTC remove nonexistent ad_id check 15 March 2021, 23:13:57 UTC
8a49101 Dave Eargle 15 March 2021, 22:56:32 UTC Merge pull request #472 from NYUCCL/fix-default-ad-url-port-443 default port should be 443 15 March 2021, 22:56:32 UTC
4c8e648 Dave Eargle 15 March 2021, 22:55:50 UTC update docs, bump version 15 March 2021, 22:55:50 UTC
f3d785f Dave Eargle 15 March 2021, 22:53:06 UTC default port should be 443 15 March 2021, 22:53:06 UTC
49488f6 Dave Eargle 15 March 2021, 21:04:35 UTC remove stray merge line 15 March 2021, 21:04:35 UTC
17bba8f Dave Eargle 15 March 2021, 21:04:18 UTC adding to avoid pain when i switch branches from gh-pages 15 March 2021, 21:04:18 UTC
0452682 Dave Eargle 15 March 2021, 20:45:42 UTC Merge pull request #470 from NYUCCL/disable-heroku-psql-provision disable psiturk-heroku-config attach-psql 15 March 2021, 20:45:42 UTC
e49f238 Dave Eargle 15 March 2021, 20:37:52 UTC disable psiturk-heroku-config attach-psql 15 March 2021, 20:37:52 UTC
2ae87a1 Dave Eargle 15 March 2021, 20:12:03 UTC Merge pull request #469 from NYUCCL/fix-heroku-docs-mention-setup-command update heroku doc to mention psiturk-heroku-config command! 15 March 2021, 20:12:03 UTC
b61a385 Dave Eargle 15 March 2021, 20:11:01 UTC update heroku doc to mention psiturk-heroku-config command! 15 March 2021, 20:11:01 UTC
e593052 Todd Gureckis 14 March 2021, 14:02:25 UTC Merge pull request #468 from NYUCCL/proof-announcement Proof announcement 14 March 2021, 14:02:25 UTC
7d7bab2 Dave Eargle 14 March 2021, 07:05:04 UTC call them notable _technical_ considerations 14 March 2021, 07:05:04 UTC
a60673c Dave Eargle 14 March 2021, 07:03:33 UTC change subsection header 14 March 2021, 07:03:33 UTC
fa0ff32 Dave Eargle 14 March 2021, 06:59:50 UTC proof the annoucnement 14 March 2021, 06:59:50 UTC
e631e87 Dave Eargle 14 March 2021, 06:40:41 UTC fix expected but absent literal block 14 March 2021, 06:40:41 UTC
7c19543 Dave Eargle 14 March 2021, 06:32:17 UTC Merge pull request #467 from NYUCCL/white-to-allow standardize on require_quals and block_quals 14 March 2021, 06:32:17 UTC
2586f61 Dave Eargle 14 March 2021, 06:24:49 UTC standardize on require_quals and block_quals 14 March 2021, 06:24:49 UTC
8269bc6 Todd Gureckis 14 March 2021, 02:33:30 UTC psiturk 3.0 announcement draft 14 March 2021, 02:33:30 UTC
24786c2 Todd Gureckis 14 March 2021, 02:31:00 UTC new links to experiment exchange 14 March 2021, 02:31:00 UTC
0e66573 Todd Gureckis 14 March 2021, 02:30:47 UTC removing info about amazon’s database 14 March 2021, 02:30:47 UTC
53d4be9 Dave Eargle 13 March 2021, 23:33:09 UTC release 3.0.0 13 March 2021, 23:33:09 UTC
454cc32 Dave Eargle 13 March 2021, 23:30:06 UTC point quickstart to heroku 13 March 2021, 23:30:06 UTC
92a19e8 Dave Eargle 13 March 2021, 23:15:46 UTC try to help readthedocs take 2 13 March 2021, 23:15:46 UTC
6a27003 Dave Eargle 13 March 2021, 23:12:14 UTC try to help readthedocs find psiturk 13 March 2021, 23:12:14 UTC
062ad39 Dave Eargle 13 March 2021, 22:54:53 UTC majorly update the heroku tutorial because it had never been updated for 3.0 13 March 2021, 22:54:53 UTC
ebdfeb0 Dave Eargle 13 March 2021, 21:32:04 UTC add documentation for ad_url 13 March 2021, 21:32:04 UTC
913b2fb Dave Eargle 13 March 2021, 20:51:16 UTC import version number from psiturk 13 March 2021, 20:51:16 UTC
7ff98bd Dave Eargle 23 February 2021, 00:05:01 UTC add draft migration guide 23 February 2021, 00:05:01 UTC
45a0fec Dave Eargle 23 February 2021, 00:04:23 UTC use layout for example templates 23 February 2021, 00:04:23 UTC
c8491ec Dave Eargle 22 February 2021, 23:08:17 UTC Merge branch 'master' of github.com:NYUCCL/psiTurk 22 February 2021, 23:08:17 UTC
1ac7cda Dave Eargle 22 February 2021, 22:20:34 UTC point to readme image within github repo 22 February 2021, 22:20:34 UTC
611db75 Dave Eargle 22 February 2021, 21:52:06 UTC Point to logfile to explain crashing 22 February 2021, 21:52:06 UTC
e53943a Dave Eargle 22 February 2021, 20:08:36 UTC ON_CLOUD config refactor - separate several defaults into their own config file, read in if ON_CLOUD=1 in env - backwards compatibility functionality for some config vars 22 February 2021, 20:08:36 UTC
c2c9560 Dave Eargle 18 November 2020, 05:52:55 UTC Merge pull request #454 from afdreher/docs-custom-qualifications Update settings.rst 18 November 2020, 05:52:55 UTC
d1cdfc0 Andrew F. Dreher 16 November 2020, 19:51:55 UTC Fixes ‘add’ => ‘ad’. This clarifies that adding a qualification to the list controls not only who sees the ad but also who may participate. 16 November 2020, 19:51:55 UTC
39b3c73 Dave Eargle 16 November 2020, 19:34:32 UTC Merge pull request #455 from afdreher/docs-typo Update settings.rst 16 November 2020, 19:34:32 UTC
2698bd5 Dave Eargle 16 November 2020, 19:33:20 UTC Merge pull request #457 from afdreher/456-cloud-config-typo Fixes typo 16 November 2020, 19:33:20 UTC
0508059 Andrew F. Dreher 16 November 2020, 18:04:04 UTC Fixes typo 16 November 2020, 18:04:04 UTC
3644e47 Andrew F. Dreher 13 November 2020, 19:24:41 UTC Update settings.rst Fixes missing quotations on comma-delimited string to match the other parts of the file 13 November 2020, 19:24:41 UTC
0ba06ec Andrew F. Dreher 13 November 2020, 19:21:01 UTC Update settings.rst Fixes a tiny typo 13 November 2020, 19:21:01 UTC
f8a45a3 Andrew F. Dreher 13 November 2020, 19:16:38 UTC Update settings.rst Adds descriptions for setting custom qualifications in the config.txt file using whitelist_qualification_ids and blacklist_qualification_ids. 13 November 2020, 19:16:38 UTC
424ed58 Dave Eargle 11 November 2020, 10:07:10 UTC Merge branch 'master' of github.com:NYUCCL/psiTurk 11 November 2020, 10:07:10 UTC
5971580 Dave Eargle 11 November 2020, 10:05:53 UTC Merge pull request #452 from jacob-lee/451_dodebugfix Issue 451: do_debug fix 11 November 2020, 10:05:53 UTC
99de428 Dave Eargle 11 November 2020, 10:03:29 UTC move sigint handling to experiment_server enables using `flask run` against just experiment.py 11 November 2020, 10:03:29 UTC
9534a50 Dave Eargle 11 November 2020, 09:57:00 UTC add TypeError because might be None 11 November 2020, 09:57:00 UTC
18a2046 Dave Eargle 11 November 2020, 08:42:39 UTC custom_init_app needs app 11 November 2020, 08:42:39 UTC
20e9812 Jacob Lee 29 October 2020, 18:51:04 UTC Fix bug in exception handling of the /sync/<uid> GET route json.loads can raise a TypeError or a ValueError in various circumstances. Most relevant is that json.loads(None) raises a TypeError, which was not being caught. 29 October 2020, 18:51:04 UTC
7ef9449 Jacob Lee 28 October 2020, 19:41:47 UTC Revert previous commit and set pfeedback to output to standard output instead of error 28 October 2020, 19:41:47 UTC
9f6f4aa Jacob Lee 28 October 2020, 19:00:11 UTC Fix feedback issue causing failed test 28 October 2020, 19:00:11 UTC
82a2f3b Jacob Lee 28 October 2020, 18:54:49 UTC Fix minor PEP8 issue 28 October 2020, 18:54:49 UTC
6733724 Dave Eargle 24 October 2020, 06:38:55 UTC bullet list bc yes 24 October 2020, 06:38:55 UTC
970cea5 Dave Eargle 24 October 2020, 06:38:05 UTC Merge branch 'jacob-lee-cleanup2' 24 October 2020, 06:38:05 UTC
32c998f Dave Eargle 24 October 2020, 06:36:46 UTC Merge branch 'cleanup2' of git://github.com/jacob-lee/psiTurk into jacob-lee-cleanup2 24 October 2020, 06:36:46 UTC
f8d74dd Dave Eargle 24 October 2020, 06:28:39 UTC add sort-of test for debug -p 24 October 2020, 06:28:39 UTC
cbbe9df Jacob Lee 23 October 2020, 18:42:48 UTC Fix url bug in do_debug 23 October 2020, 18:42:48 UTC
7ffed1c Jacob Lee 23 October 2020, 18:18:03 UTC Fix bug in ad url construction 23 October 2020, 18:18:03 UTC
0d01132 Jacob Lee 22 October 2020, 23:42:09 UTC Fix linebreaks in markdown file 22 October 2020, 23:42:09 UTC
bf070d3 Jacob Lee 22 October 2020, 19:48:28 UTC Remove import of annotations from __future__ 22 October 2020, 19:48:28 UTC
5698c24 Jacob Lee 22 October 2020, 18:21:05 UTC Fix commenting alignment and simplify call to super 22 October 2020, 18:21:05 UTC
bf9fd76 Jacob Lee 22 October 2020, 17:34:46 UTC Clean up code with style corrections, bug fixes, and removing unused imports 22 October 2020, 17:34:46 UTC
0e5ba80 Jacob Lee 22 October 2020, 03:13:12 UTC Add missing import statement deleted during merge 22 October 2020, 03:13:12 UTC
b3ceba7 Jacob Lee 22 October 2020, 02:08:52 UTC Fix error is merge 22 October 2020, 02:08:52 UTC
ecd0b77 Jacob Lee 21 October 2020, 20:12:15 UTC Clean up code and minor code fixes 22 October 2020, 01:44:43 UTC
8fcbfb0 Dave Eargle 21 October 2020, 20:04:00 UTC Merge pull request #448 from afdreher/447-sample Fixes example 21 October 2020, 20:04:00 UTC
b2ef6b3 Andrew F. Dreher 21 October 2020, 19:22:15 UTC Adds quotation marks to escape the codeversion. Without the quotations, the codeversion may be interpreted as a number, which can yield errors. Updates the comments to reflect the usage of the variables. 21 October 2020, 19:22:15 UTC
86b5737 Dave Eargle 21 October 2020, 06:15:29 UTC Merge branch 'master' of github.com:NYUCCL/psiTurk 21 October 2020, 06:15:29 UTC
51e9fc7 Dave Eargle 21 October 2020, 05:51:42 UTC Merge branch 'config-refactor' 21 October 2020, 05:51:42 UTC
3a08ed8 Dave Eargle 21 October 2020, 05:45:49 UTC a few title renames 21 October 2020, 05:45:49 UTC
f9f56d7 Dave Eargle 21 October 2020, 05:33:08 UTC Merge pull request #442 from jacob-lee/shutdownfix Refactor server shutdown 21 October 2020, 05:33:08 UTC
cbc87a0 Dave Eargle 16 October 2020, 22:57:29 UTC Merge pull request #446 from NYUCCL/jacob-lee-443-ps_cleanup Jacob lee 443 ps cleanup 16 October 2020, 22:57:29 UTC
92b5dab Dave Eargle 16 October 2020, 22:51:11 UTC remote complete_* todos these functions are used by cmd2 16 October 2020, 22:51:11 UTC
86c7241 Dave Eargle 16 October 2020, 22:47:06 UTC Merge branch '443-ps_cleanup' of git://github.com/jacob-lee/psiTurk into jacob-lee-443-ps_cleanup 16 October 2020, 22:47:06 UTC
9c9e353 Dave Eargle 14 October 2020, 22:58:51 UTC typo 14 October 2020, 22:58:51 UTC
89b7066 Dave Eargle 13 October 2020, 02:20:25 UTC changelog description for 2.3.11 13 October 2020, 02:20:25 UTC
a45c7d5 Dave Eargle 13 October 2020, 01:22:36 UTC remove psiturk_org_services 13 October 2020, 01:22:36 UTC
16d5d48 Dave Eargle 13 October 2020, 01:14:54 UTC proofreading 13 October 2020, 01:14:54 UTC
962b946 Dave Eargle 12 October 2020, 23:51:05 UTC add note about not seeing hit on mturk gui 12 October 2020, 23:51:05 UTC
35ed8db Dave Eargle 12 October 2020, 23:23:52 UTC Experiment exchange 12 October 2020, 23:23:52 UTC
a8cd50e Dave Eargle 12 October 2020, 21:41:17 UTC have default of None for aws creds 12 October 2020, 21:41:17 UTC
f579722 Dave Eargle 11 October 2020, 10:24:54 UTC woo anon links 11 October 2020, 10:24:54 UTC
e83dcbe Dave Eargle 11 October 2020, 10:23:59 UTC document allowance of .psiturkconfig 11 October 2020, 10:23:59 UTC
bd4f3be Dave Eargle 11 October 2020, 09:58:13 UTC put .psiturkconfig back in the read-from list ... but don't create one for the user if absent. 11 October 2020, 09:58:13 UTC
b5f1dc2 Dave Eargle 11 October 2020, 08:49:28 UTC doc restructuring 11 October 2020, 08:49:28 UTC
c208640 Jacob Lee 09 October 2020, 19:57:23 UTC Replace bare except clause with appropriate exceptions and refactor variable name to conform to PEP8 09 October 2020, 19:57:23 UTC
1dd197a Dave Eargle 09 October 2020, 07:11:50 UTC move two config settings to different sections 09 October 2020, 07:11:50 UTC
8e3b47f Jacob Lee 09 October 2020, 04:43:57 UTC Fix reference errors, typos, and improve conformance to PEP8 in psiturk_shell.py - Improved compliance with PEP8 - Rewrote misleading comments (invalidated by subsequent changes to code) - Removed duplicated class methods from PsiturkNetworkShell (two methods duplicated) - Fixed variables that were referenced before assignment (or potentially references before assignment) - Added TODOs for items where the intent was not clear, or where code looked like was not finished or is no longer used - Fixed several typos that would have raised exceptions 09 October 2020, 04:43:57 UTC
2318454 Dave Eargle 08 October 2020, 18:48:01 UTC Merge branch 'config-refactor' of github.com:NYUCCL/psiTurk into config-refactor 08 October 2020, 18:48:01 UTC
73d4f5a Dave Eargle 08 October 2020, 18:47:57 UTC have to account for the `;` at the beginning now 08 October 2020, 18:47:57 UTC
97a298a Jacob Lee 08 October 2020, 17:09:38 UTC Fix bug in logger setup. 08 October 2020, 17:09:38 UTC
7bdf7a9 Jacob Lee 08 October 2020, 17:01:14 UTC Replace calls to print with calls to a module level logger 08 October 2020, 17:01:14 UTC
06cae6a Dave Eargle 08 October 2020, 07:07:22 UTC have to account for the `;` at the beginning now 08 October 2020, 07:07:22 UTC
eb0486b Dave Eargle 08 October 2020, 06:56:59 UTC call the config.txt and custom.py "samples" 08 October 2020, 06:56:59 UTC
8b10e5e Dave Eargle 08 October 2020, 06:50:48 UTC Merge branch 'docs-refactor' into config-refactor 08 October 2020, 06:50:48 UTC
178d335 Dave Eargle 08 October 2020, 06:50:26 UTC move back to old section headings because i got cold feet about having to field dozens of emails of users who wanted to run old experiment config files 08 October 2020, 06:50:26 UTC
aa16a12 Dave Eargle 08 October 2020, 06:05:41 UTC initial commit for docs refactor 08 October 2020, 06:05:41 UTC
fbc79a0 Jacob Lee 07 October 2020, 22:01:09 UTC Refactor how server shutdown is accomplished Existing code used a http request to get the process ID of the server, since the command to shut the server down runs under a different process. This had two consequences: 1. the PID was a publicly accessible via http request 2. the request is asynchronous The call to kill the server process was also asynchronous (os.kill) This introduced a race condition that sometimes caused the program to report that the process was still running. Also, when running a remote shell, the process id of the server could not be idenified using the existing means, if the connection was interrupted and a new shell established. Changes here: - uses psutil to iterate through the processes looking for psiturk_experiment_server + a particular known hash and the term 'master' - uses psutil to recursively kill the process tree - removes the route - adds a SIGTERM handler to experiment.py and removes the on_exit hook from experiment_server.py to handle the situation when, within psiturk-shell, ^C is pressed. Otherwise the message was showing when running command `psiturk server off`. 07 October 2020, 22:01:09 UTC
32f1a24 Dave Eargle 07 October 2020, 04:52:18 UTC ignore .python-version 07 October 2020, 04:52:18 UTC
9f87876 Jacob Lee 07 October 2020, 00:52:55 UTC Reformat code to better conform to PEP8 07 October 2020, 00:52:55 UTC
back to top