| 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 |
| 8f4a24c | Dave Eargle | 06 October 2020, 22:32:30 UTC | Merge branch 'master' into config-refactor | 06 October 2020, 22:32:30 UTC |
| 1082237 | Dave Eargle | 06 October 2020, 22:32:21 UTC | tox also do py38 | 06 October 2020, 22:32:21 UTC |
| b6487e8 | Dave Eargle | 06 October 2020, 22:31:51 UTC | Merge branch 'master' of github.com:NYUCCL/psiTurk | 06 October 2020, 22:31:51 UTC |
| 10857bc | Dave Eargle | 06 October 2020, 22:28:37 UTC | Merge pull request #441 from NYUCCL/python-3.8 travis remove macos, add python 3.8... | 06 October 2020, 22:28:37 UTC |
| 59261e0 | Dave Eargle | 06 October 2020, 22:19:03 UTC | travis remove macos, add python 3.8... | 06 October 2020, 22:19:03 UTC |
| a745037 | Dave Eargle | 06 October 2020, 22:18:30 UTC | travis remove macos, add python 3.8... | 06 October 2020, 22:18:30 UTC |
| 886628c | Dave Eargle | 06 October 2020, 22:16:44 UTC | Merge branch 'is-bug' | 06 October 2020, 22:16:44 UTC |
| 42a841c | Dave Eargle | 06 October 2020, 21:57:23 UTC | patch aws services wrapper and remove debug print | 06 October 2020, 21:57:23 UTC |
| 913997b | Jacob Lee | 06 October 2020, 20:51:47 UTC | Fix bug in ExperimentServerController and improve cross-platform support The methd kill_child_processes had several bugs which apparently failed silently when running most of the time. However this method is only used to kill the child process of the shell process used to grep for the psiturk server processes. I removed this method, and altered the is_server_running method to avoid using a (platform dependent) set of operating system tools (grep, awk, ps). Instead it uses the cross-platform tools that shutil library already provides. In particular it uses process_iter to safely iterate through the processes in a way that avoids race conditions. | 06 October 2020, 20:51:47 UTC |
| c338f43 | Dave Eargle | 06 October 2020, 17:31:43 UTC | bump pytest | 06 October 2020, 17:33:35 UTC |
| 38882a2 | Dave Eargle | 06 October 2020, 17:31:43 UTC | bump pytest | 06 October 2020, 17:31:43 UTC |
| e129b45 | Dave Eargle | 06 October 2020, 17:26:10 UTC | switch section name for 'server parameters' | 06 October 2020, 17:26:10 UTC |
| 0bdaa92 | Dave Eargle | 06 October 2020, 06:18:37 UTC | nest ad_url under its own config section | 06 October 2020, 06:18:37 UTC |
| 40f24f3 | Dave Eargle | 06 October 2020, 05:47:13 UTC | first pass at refactoring config stuff * also removing psiturk ad server | 06 October 2020, 06:15:21 UTC |
| a89a648 | Will Foran | 07 April 2020, 18:30:44 UTC | ✨ config: add 'USE_ENV'; like 'ON_CLOUD' but for localhost | 06 October 2020, 06:14:03 UTC |
| 21993df | Will Foran | 07 April 2020, 17:42:05 UTC | ✨ look to env for more config overrides | 06 October 2020, 06:13:45 UTC |
| 667279d | Will Foran | 07 April 2020, 18:06:58 UTC | 📝 db and port notes in heroku docs | 06 October 2020, 06:13:15 UTC |
| 3b3c695 | Dave Eargle | 21 September 2020, 23:12:05 UTC | update changelog for 2.3.10 | 21 September 2020, 23:12:05 UTC |
| 815a8bf | Dave Eargle | 21 September 2020, 23:05:30 UTC | add test for bonus amount type | 21 September 2020, 23:05:30 UTC |
| e3fb34f | Dave Eargle | 19 August 2020, 17:46:02 UTC | Merge pull request #433 from NYUCCL/heroku_instructions Heroku instructions warn about exposing database_url. | 19 August 2020, 17:46:02 UTC |
| e2b5fdf | Ili Ma | 11 August 2020, 21:07:07 UTC | Heroku instructions warn about exposing database_url. Commit instructions moved so people following the guide don't commit it by default. Added a note on ON_CLOUD and a googlable error you'd get if you forget to set it. | 11 August 2020, 21:07:07 UTC |
| ea82b12 | ili-ma | 03 August 2020, 04:10:50 UTC | Merge pull request #428 from Tubeliar/patch-1 Update install.rst for running psiturk on windows | 03 August 2020, 04:10:50 UTC |
| 6029248 | Tubeliar | 12 June 2020, 02:35:12 UTC | Update install.rst for running psiturk on windows Added a short section on running psiturk in a virtual machine and a longer section about running psiturk in WSL. | 12 June 2020, 02:35:12 UTC |
| 5891530 | Dave Eargle | 29 May 2020, 15:16:33 UTC | Merge pull request #423 from jacob-lee/loggingsecretsfix Remove INFO level logging of secret key | 29 May 2020, 15:16:33 UTC |
| d54eddd | Jacob Lee | 29 May 2020, 14:48:26 UTC | Remove INFO level logging of secret key | 29 May 2020, 14:48:26 UTC |
| 1ee287d | Dave Eargle | 21 May 2020, 21:01:06 UTC | update changelog | 21 May 2020, 21:01:06 UTC |
| 1e492bf | Dave Eargle | 21 May 2020, 21:00:19 UTC | get expiration from xml object options thing, not from dictionary closes #421 | 21 May 2020, 21:00:19 UTC |
| a63fc82 | Dave Eargle | 09 May 2020, 04:52:55 UTC | Log to None, not '-' | 09 May 2020, 04:52:55 UTC |
| 98d42a0 | Dave Eargle | 09 May 2020, 03:06:09 UTC | dashboard needs `as app` | 09 May 2020, 03:06:09 UTC |
| 0d6fca2 | Dave Eargle | 08 May 2020, 22:38:47 UTC | log flask messages to gunicorn logs | 08 May 2020, 22:38:47 UTC |
| 6b83883 | Dave Eargle | 08 May 2020, 22:38:30 UTC | Track mode in flask session | 08 May 2020, 22:38:30 UTC |
| e136d0e | Dave Eargle | 07 May 2020, 18:30:07 UTC | bit by mutable default arguments! | 07 May 2020, 18:30:07 UTC |
| 53b0af2 | Dave Eargle | 07 May 2020, 02:24:00 UTC | do not allow scheduler if more than one thread | 07 May 2020, 02:24:00 UTC |
| e498b20 | Dave Eargle | 07 May 2020, 02:12:10 UTC | conditionally and explicitly enable dashboard | 07 May 2020, 02:12:10 UTC |
| 9cb1034 | Dave Eargle | 05 May 2020, 22:45:44 UTC | gevent monkey patch | 05 May 2020, 22:45:44 UTC |
| 6138420 | Dave Eargle | 05 May 2020, 22:45:16 UTC | wrap scheduler in conditional env var | 05 May 2020, 22:45:16 UTC |
| 8fa3ff9 | Dave Eargle | 05 May 2020, 22:42:48 UTC | log results of failed posts | 05 May 2020, 22:42:48 UTC |
| ec9b311 | Dave Eargle | 10 April 2020, 21:12:53 UTC | blacklist and whitelist qualifications settable in config.txt as require_quals or block_quals or passable as command-line args | 10 April 2020, 21:12:53 UTC |
| 332b961 | Will Foran | 06 April 2020, 19:16:00 UTC | 🐛 fix #412: jquery path typo, localhost=>127.0.0.1, contact_email_on_error (#413) * 🐛 fix #412: jquery path typo, localhost=>127.0.0.1, contact_email_on_error * wrap email_address in quotes in js in exp.html Co-authored-by: Dave Eargle <dave@daveeargle.com> | 06 April 2020, 19:16:00 UTC |
| 27d7ed4 | Dave Eargle | 28 March 2020, 21:49:29 UTC | fix broken build | 28 March 2020, 21:49:29 UTC |
| 4e78d69 | Dave Eargle | 28 March 2020, 21:31:37 UTC | auto do postgresql | 28 March 2020, 21:31:37 UTC |
| b546c09 | Dave Eargle | 26 March 2020, 23:28:19 UTC | new command-line option to do all heroku config in one command. move heroku files out of exmaple dir | 26 March 2020, 23:28:19 UTC |
| 41c273c | Dave Eargle | 26 March 2020, 02:43:10 UTC | remove more deps from main requirements.txt file | 26 March 2020, 02:43:10 UTC |
| 2679173 | Dave Eargle | 25 March 2020, 23:40:56 UTC | bump gunicorn | 25 March 2020, 23:40:56 UTC |
| f1fc674 | Dave Eargle | 25 March 2020, 23:32:37 UTC | Merge branch 'master' of github.com:NYUCCL/psiTurk | 25 March 2020, 23:32:37 UTC |
| b2ea88d | Dave Eargle | 25 March 2020, 23:31:25 UTC | add doc building packages to setup.py so `pip install psiturk[dev]` works | 25 March 2020, 23:31:25 UTC |
| aee0826 | Dave Eargle | 25 March 2020, 23:29:30 UTC | bump certifi | 25 March 2020, 23:29:30 UTC |
| d6b5c5f | Dave Eargle | 25 March 2020, 23:28:30 UTC | remove six dependency | 25 March 2020, 23:28:30 UTC |
| c1b513b | dhalpern | 25 March 2020, 23:12:50 UTC | Heroku DB (#396) * check for env vars * adding error * add import * wrong import * wrong check * test * fix error check * remove extra print statement * changing ON_HEROKU to ON_CLOUD | 25 March 2020, 23:12:50 UTC |
| 60da646 | Dave Eargle | 25 March 2020, 23:02:25 UTC | Merge pull request #409 from afdreher/408-config-help Creates basic help for config | 25 March 2020, 23:02:25 UTC |
| 2519f6f | Dave Eargle | 25 March 2020, 23:00:43 UTC | Merge branch '408-config-help' of https://github.com/afdreher/psiTurk into afdreher-408-config-help | 25 March 2020, 23:00:43 UTC |
| c7b23c6 | Dave Eargle | 25 March 2020, 22:59:56 UTC | Merge pull request #407 from afdreher/406-delete Removes references to dispose | 25 March 2020, 22:59:56 UTC |
| a6c1cf5 | Dave Eargle | 25 March 2020, 22:57:55 UTC | Merge branch 'hstojic-patch-1' | 25 March 2020, 22:57:55 UTC |
| 7a0411a | Dave Eargle | 25 March 2020, 22:50:59 UTC | Merge branch 'patch-1' of https://github.com/hstojic/psiTurk into hstojic-patch-1 | 25 March 2020, 22:50:59 UTC |
| 632a192 | Dave Eargle | 25 March 2020, 22:35:04 UTC | pipreqs the master requirements.txt | 25 March 2020, 22:35:04 UTC |
| 35aa194 | Dave Eargle | 25 March 2020, 22:19:36 UTC | fix noaws tests | 25 March 2020, 22:19:36 UTC |
| 056a5a2 | Dave Eargle | 23 March 2020, 18:54:00 UTC | add contact_address and codeversion as available js vars in exp.html | 23 March 2020, 18:54:00 UTC |
| 9259270 | Dave Eargle | 18 March 2020, 16:34:18 UTC | bump jquery, underscore, backbone | 18 March 2020, 16:34:18 UTC |
| 7606038 | Dave Eargle | 18 March 2020, 16:30:16 UTC | make preload pages work in parallel | 18 March 2020, 16:30:16 UTC |
| 9615627 | Andrew F. Dreher | 17 March 2020, 20:46:26 UTC | Adds basic help for the `config` command. There are 3 changes: 1) The `config help` command now calls `help_config()` instead of `help_server()`. 2) There is now a stubbed “config.txt” help file. 3) The .gitignore file is updated to allow for any .txt file inside the shell_help file to be visible to git. The rule to ignore the main configuration file, config.txt, shadows the config.txt help file. | 17 March 2020, 20:46:26 UTC |
| bea66fc | Andrew F. Dreher | 17 March 2020, 17:09:28 UTC | Removes 'dispose' from the autocomplete list. Replaces the reference to 'dispose' with 'delete' in the hit.txt help file, and adds a space to make up for the character differences, thus aligning the text block. | 17 March 2020, 17:15:28 UTC |
