| dbb6fff | Dave Eargle | 20 February 2019, 20:56:29 UTC | bump version but not calling it stable in readme yet | 20 February 2019, 20:56:29 UTC |
| 661bf21 | Dave Eargle | 20 February 2019, 20:49:54 UTC | Merge pull request #338 from jpalat/337-parse-httpbin-response Fixes 377 by parsing the json returned from httpbin.org. | 20 February 2019, 20:49:54 UTC |
| 28aa85f | Jay Palat | 20 February 2019, 20:44:35 UTC | Fixes 377 by parsing the json returned from httpbin.org. This method is safe if the previous output is provided. | 20 February 2019, 20:44:35 UTC |
| 6508f1c | Todd Gureckis | 09 February 2019, 07:55:00 UTC | require the certifi library psiturk SSL certificates were recently updated and for whatever reason the certs no longer validated. this is fixed by including a dependency on `certifi`, so here it is. https://pypi.org/project/certifi/ resolves #336 | 09 February 2019, 07:55:00 UTC |
| c5d2608 | Dave Eargle | 28 December 2018, 23:01:17 UTC | Merge pull request #335 from hyiltiz/master later SQAlchamy is compatible with mysql 8.0 | 28 December 2018, 23:01:17 UTC |
| 38254d5 | qcao | 28 December 2018, 08:08:57 UTC | later SQAlchamy is compatible with mysql 8.0 | 28 December 2018, 08:08:57 UTC |
| 9806225 | Dave Eargle | 16 September 2018, 04:04:53 UTC | off first before submit to avoid unload warning | 16 September 2018, 04:04:53 UTC |
| a51b5b7 | Dave Eargle | 16 September 2018, 04:03:43 UTC | disabling for now because it is broken | 16 September 2018, 04:03:43 UTC |
| 6e1422e | Dave Eargle | 16 September 2018, 04:03:19 UTC | one more raw config get | 16 September 2018, 04:03:19 UTC |
| ee5a47c | Dave Eargle | 16 September 2018, 03:32:14 UTC | amend previous commit... | 16 September 2018, 03:32:14 UTC |
| c02c626 | Dave Eargle | 16 September 2018, 03:30:43 UTC | read in title and description raw | 16 September 2018, 03:30:43 UTC |
| cc532db | Dave Eargle | 15 September 2018, 06:39:30 UTC | Merge branch 'master' of github.com:NYUCCL/psiTurk | 15 September 2018, 06:39:30 UTC |
| d18c2bd | Dave Eargle | 15 September 2018, 06:36:57 UTC | * swanky new feature that lets psiturk dynamically count the number of conditions based on the num of keys in a file called 'conditions.json' if it is present in the root of the project dir * make the rand_count depend on the mode of the server | 15 September 2018, 06:36:57 UTC |
| fbb4a0c | Dave Eargle | 15 September 2018, 06:22:28 UTC | Merge pull request #327 from ariekahn/235-fix-style-tag Fixes #235. Remove slash from opening style tag | 15 September 2018, 06:22:28 UTC |
| 6672879 | Dave Eargle | 15 August 2018, 21:01:39 UTC | Merge pull request #318 from ariekahn/bf/status_tally bf: reference to tally_hits should be update_hit_tally | 15 August 2018, 21:01:39 UTC |
| 3ffbe9b | Dave Eargle | 15 August 2018, 21:00:19 UTC | Merge pull request #326 from adamliter/fix/282 Respect PSITURK_GLOBAL_CONFIG_LOCATION in setup-example | 15 August 2018, 21:00:19 UTC |
| 6439e28 | Dave Eargle | 15 August 2018, 20:59:08 UTC | Merge pull request #329 from ariekahn/enh/config_gunicorn_timeout enh: add parameter to control gunicorn server timeout | 15 August 2018, 20:59:08 UTC |
| cc25ecc | Dave Eargle | 15 August 2018, 20:57:40 UTC | Update runtime.txt | 15 August 2018, 20:57:40 UTC |
| 5519074 | Dave Eargle | 15 August 2018, 20:57:15 UTC | Update heroku.rst | 15 August 2018, 20:57:15 UTC |
| c74c94f | Ari Kahn | 15 August 2018, 16:43:29 UTC | enh: add parameter to control gunicorn server timeout | 15 August 2018, 16:43:29 UTC |
| 5902311 | Ari Kahn | 01 August 2018, 16:53:01 UTC | Fixes #235. Remove slash from opening style tag | 01 August 2018, 16:53:01 UTC |
| 337ba52 | Adam Liter | 24 August 2017, 14:06:33 UTC | Respect PSITURK_GLOBAL_CONFIG_LOCATION in setup-example Closes #282 | 28 July 2018, 19:16:36 UTC |
| df5a61f | Dave Eargle | 18 July 2018, 07:17:23 UTC | Fix call to get_active_hits Closes #323 | 18 July 2018, 07:17:23 UTC |
| 1512db4 | Todd Gureckis | 02 July 2018, 03:40:14 UTC | Merge pull request #320 from anselmrothe/master Get rid of the mysql-python dependency | 02 July 2018, 03:40:14 UTC |
| 20d522b | anselmrothe | 29 June 2018, 20:43:20 UTC | update documentation for pymysql | 29 June 2018, 20:43:20 UTC |
| ad3352e | anselmrothe | 29 June 2018, 20:32:59 UTC | use pymysql for MySQL | 29 June 2018, 20:32:59 UTC |
| da1c0b5 | anselmrothe | 29 June 2018, 19:16:08 UTC | Revert "add pymysql as requirement" This reverts commit a5a5e71cbefddafe1faf16c9615a0d944425eaa8. | 29 June 2018, 19:16:08 UTC |
| 3115a22 | anselmrothe | 29 June 2018, 19:16:02 UTC | Revert "no more mysql-python hassle" This reverts commit ca38bcb2cb9ed50a6b338387f89917ee9a508c9a. | 29 June 2018, 19:16:02 UTC |
| ca38bcb | anselmrothe | 29 June 2018, 00:58:07 UTC | no more mysql-python hassle turn “mysql://” from config.txt into “mysql+pymysql://” | 29 June 2018, 00:58:07 UTC |
| a5a5e71 | anselmrothe | 29 June 2018, 00:45:50 UTC | add pymysql as requirement | 29 June 2018, 00:45:50 UTC |
| cf9983e | anselmrothe | 29 June 2018, 00:41:50 UTC | use newer SQLAlchemy to fix error: ‘LookupError: unknown encoding: utf8mb4’ | 29 June 2018, 00:41:50 UTC |
| 7b4cd95 | anselmrothe | 29 June 2018, 00:16:27 UTC | use pymysql | 29 June 2018, 00:19:15 UTC |
| 2ea12bc | Dave Eargle | 08 June 2018, 19:06:40 UTC | return empty array if no valid credentials | 08 June 2018, 19:06:40 UTC |
| 8f03bdd | Ari Kahn | 22 April 2018, 00:09:04 UTC | bf: reference to tally_hits should be update_hit_tally | 22 April 2018, 00:09:04 UTC |
| 36c1c00 | Dave Eargle | 18 April 2018, 23:18:26 UTC | hacky fix to not update hit tally if quiet | 18 April 2018, 23:18:26 UTC |
| 6e0325c | Dave Eargle | 16 April 2018, 21:53:03 UTC | init db if necessary for _get_my_hitids | 16 April 2018, 21:53:03 UTC |
| 1fd08c9 | Dave Eargle | 06 April 2018, 05:43:42 UTC | Merge branch 'master' of github.com:NYUCCL/psiTurk | 06 April 2018, 05:43:42 UTC |
| 47015cd | Dave Eargle | 06 April 2018, 05:43:00 UTC | Merge branch 'Speldosa-Speldosa_AWS_2' | 06 April 2018, 05:43:00 UTC |
| 9b67046 | Dave Eargle | 06 April 2018, 05:38:02 UTC | Merge branch 'Speldosa_AWS_2' of git://github.com/Speldosa/psiTurk into Speldosa-Speldosa_AWS_2 | 06 April 2018, 05:38:02 UTC |
| ac1d663 | Dave Eargle | 06 April 2018, 05:11:39 UTC | Merge pull request #314 from Speldosa/Speldosa_Hit_help_fix Fixed a typo in the help command for `hit` | 06 April 2018, 05:11:39 UTC |
| 64b86ed | Dave Eargle | 06 April 2018, 05:09:15 UTC | Merge branch 'Speldosa-Speldosa_HEROKU_2' | 06 April 2018, 05:09:15 UTC |
| 688a109 | Dave Eargle | 06 April 2018, 05:01:48 UTC | add some heroku tips and tricks | 06 April 2018, 05:01:48 UTC |
| ffc0bba | Martin Asperholm | 06 April 2018, 01:36:13 UTC | Added a couple of steps to the tutorial describing how to actually run an experiment and downloading data. | 06 April 2018, 01:36:13 UTC |
| 6e9c396 | Martin Asperholm | 04 April 2018, 18:00:27 UTC | Fixed a typo | 04 April 2018, 18:00:27 UTC |
| f0e5e16 | Martin Asperholm | 04 April 2018, 15:45:03 UTC | Merge remote-tracking branch 'NYUCCL/master' | 04 April 2018, 15:45:03 UTC |
| 9a45ff7 | Martin Asperholm | 03 April 2018, 01:12:15 UTC | Merge remote-tracking branch 'NYUCCL/master' into Speldosa_HEROKU_2 | 03 April 2018, 01:12:15 UTC |
| a9173f1 | Martin Asperholm | 03 April 2018, 01:10:55 UTC | Merge remote-tracking branch 'NYUCCL/master' into Speldosa_AWS_2 | 03 April 2018, 01:10:55 UTC |
| a05f4e7 | Martin Asperholm | 03 April 2018, 01:06:04 UTC | Merge remote-tracking branch 'origin/master' into Speldosa_AWS_d | 03 April 2018, 01:06:04 UTC |
| c6a931c | Dave Eargle | 02 April 2018, 23:15:35 UTC | Merge pull request #313 from Speldosa/Speldosa_Fix_documents Cleared up most warnings that Sphinx threw during compilation of docs | 02 April 2018, 23:15:35 UTC |
| f5812a2 | Martin Asperholm | 02 April 2018, 23:03:54 UTC | Sphinx threw several pages worth of warnings when compiling the docs, most of them having to do with formating errors. I cleared these up and made the formating more consistent between all pages. There's only a couple of errors left now that I couldn't solve easy. | 02 April 2018, 23:03:54 UTC |
| 98058a2 | Martin Asperholm | 02 April 2018, 01:09:26 UTC | Merge remote-tracking branch 'NYUCCL/master' | 02 April 2018, 01:09:26 UTC |
| a366a19 | Speldosa | 02 April 2018, 00:36:21 UTC | Added ad hosing on Heroku I modified the instructions so that you now host your ads on Heroku as well (rather than on the psiTurk Secure Ad Server). | 02 April 2018, 00:36:21 UTC |
| 4528564 | Speldosa | 31 March 2018, 19:23:00 UTC | Updated the index file to include the Heroku docs This makes the Heroku docs appear in the table of contents on the very first page of the docs, but I don't get what else I have to do for it to appear in the left menu. I have the same problem in pull request #310. | 31 March 2018, 19:23:00 UTC |
| e053e76 | Speldosa | 31 March 2018, 19:18:31 UTC | Updated the docs Everything _should_ be correct and ready for merge now. | 31 March 2018, 19:18:31 UTC |
| b5fdf1f | Martin Asperholm | 30 March 2018, 16:57:56 UTC | Initial commit | 30 March 2018, 16:57:56 UTC |
| 7d9051c | Dave Eargle | 29 March 2018, 19:02:19 UTC | new `worker approve` and `hit list` functionality * `worker approve --all` # approve all workers for the current study * new argument for `worker approve` -- `[--force]` # approve the workers even if they're not found in the local db * `worker approve --all --force` # approve all workers with hitds that match those found in the local db, even if the specific worker is not found in the local db * `worker approve --all --all-studies --force` # approve all workers found with the current mturk credentials, regardless of whether the hitid is associated with the current study` * `worker approve (--hit <hitid> ...)` multiple hitids can now be passed in one shot * `hit list` # defaults to only return hits with hitids matching those found in the current db * `hit list --all-studies` # return all hits associatd with the current mturk credentials, regardless of whether they're associated with the current study db Functionality loosely tested by me. See #286 | 29 March 2018, 19:07:33 UTC |
| 61a176f | Speldosa | 29 March 2018, 17:59:59 UTC | Fixed subheadings | 29 March 2018, 17:59:59 UTC |
| 547b650 | Dave Eargle | 29 March 2018, 17:47:41 UTC | Merge branch 'fredcallaway-master' | 29 March 2018, 17:47:41 UTC |
| 0402ab7 | Dave Eargle | 29 March 2018, 17:43:00 UTC | Merge branch 'master' of git://github.com/fredcallaway/psiTurk into fredcallaway-master | 29 March 2018, 17:43:00 UTC |
| 2e7ede1 | Martin Asperholm | 27 March 2018, 23:59:05 UTC | Updated the content and formating I've gone through and updated both the content and the formating of this whole document. Most notably, I added that you need to have the location set to "US East" in order to find to the pre-built image at all. I also really think it should be linked to in the quickstart (see issue #306). | 27 March 2018, 23:59:05 UTC |
| 694d1c5 | Martin Asperholm | 27 March 2018, 23:58:20 UTC | Added amazon_ec2 to the left menu I'm not sure why it wasn't already included. | 27 March 2018, 23:58:20 UTC |
| 374d907 | Dave Eargle | 26 March 2018, 21:33:05 UTC | refactor worker_list and worker_approve * created new get_workers in the wrapper * wrapper now only approves one worker at a time, expected to be fed a list of workers * shell 'worker_approve' now first fetches a list of workers, and then sends them to the wrapper to be approved one a time. * new 'worker_approve' argument '--all'. Crude and inefficent function -- fetches _all_ submitted workers for the given mturk credentials, and attempts to approve all of them. But the wrapper will not approve anyone that it cannot find in the study's psiturk db -- which means that if one set of credentials are running multiple experiments, this command must be run once from each study's local directory | 26 March 2018, 21:33:05 UTC |
| 647c780 | Dave Eargle | 26 March 2018, 02:53:38 UTC | better separate worker_list | 26 March 2018, 02:53:38 UTC |
| ee5b2db | fredcallaway | 18 March 2018, 20:59:41 UTC | remove unnecessary imports in psiturk_shell.py | 18 March 2018, 20:59:41 UTC |
| 7ae468c | Dave Eargle | 13 March 2018, 06:10:50 UTC | more tacky error handling for hit_create, but at least it raises an exception now | 13 March 2018, 06:10:50 UTC |
| 4f91369 | Dave Eargle | 13 March 2018, 06:04:30 UTC | abstraction version 2 - `quiet` is back in full force, but is used exclusively in `psiturk_shell` - `hit_create` interactivity and much of its printing have been moved to psiturk_shell. Error handling is still a mess though (and using general Exception which is bad) - lazy-load web_services in the shell, so that `quiet` doesn't have to wait for psiturkorg credentials to be checked - lazy-load all service objects in amt_service_wrapper, also for speed reasons - worker_list returns json instead of immediately printing it | 13 March 2018, 06:04:30 UTC |
| 8a9b840 | Dave Eargle | 13 March 2018, 06:04:02 UTC | make get_my_ip global, and move some other functions into a utils file | 13 March 2018, 06:04:02 UTC |
| 7288e13 | Dave Eargle | 13 March 2018, 06:03:16 UTC | assume that any unknown args are a psiturk command to be executed | 13 March 2018, 06:03:16 UTC |
| c5a930a | Dave Eargle | 12 March 2018, 05:35:11 UTC | first pass at decoupling amt_services from the shell Tested most of the mturk commands through the shell. Have not tested by direct import in python script yet. | 12 March 2018, 06:17:50 UTC |
| 04a9243 | Todd Gureckis | 10 February 2018, 20:48:47 UTC | Merge pull request #300 from jacob-lee/joinfix Changed psiturk_config.py to use os.path.join and code clean up. | 10 February 2018, 20:48:47 UTC |
| 22e0844 | Jacob Lee | 10 February 2018, 20:35:46 UTC | Changed path concatenation to used os.path join Two changes were implemented in this commit. * In some places, config file paths were constructed using string concatenation. This was changed to use os.path.join. * Code cleanup, e.g. lines < 80 chars. | 10 February 2018, 20:35:46 UTC |
| 703d4ed | Dave Eargle | 06 February 2018, 22:38:44 UTC | 2.7.1 because of psycopg/psycopg2#594 https://github.com/psycopg/psycopg2/issues/594#issuecomment-346514672 | 06 February 2018, 22:38:44 UTC |
| 331122c | Dave Eargle | 03 February 2018, 02:35:13 UTC | this line is required by travis to avoid a non-fatal error, but prevents install... | 03 February 2018, 02:35:13 UTC |
| 42e719a | Dave Eargle | 28 January 2018, 05:31:06 UTC | test deploy is borked. will not overwrite existing zips anymore, not sure why | 28 January 2018, 05:31:06 UTC |
| 908ce7b | Dave Eargle | 28 January 2018, 05:14:29 UTC | Merge branch 'master' of github.com:NYUCCL/psiTurk | 28 January 2018, 05:14:29 UTC |
| fca8d6c | Dave Eargle | 28 January 2018, 05:13:59 UTC | add convenience script for heroku config:set commands | 28 January 2018, 05:14:08 UTC |
| 3d6994c | Dave Eargle | 26 January 2018, 23:43:35 UTC | pypi api moved See https://packaging.python.org/guides/migrating-to-pypi-org/#using-testpypi | 26 January 2018, 23:43:35 UTC |
| 524d0fb | Dave Eargle | 26 January 2018, 23:00:39 UTC | import flask logging to make travis coverage run work I have no idea why this is necessary, but we were suddenly getting this error otherwise: ``` Error in atexit._run_exitfuncs: Traceback (most recent call last): File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/usr/lib/python2.7/logging/__init__.py", line 1653, in shutdown h.flush() File "/usr/lib/python2.7/logging/__init__.py", line 834, in flush if self.stream and hasattr(self.stream, "flush"): File "/usr/local/lib/python2.7/dist-packages/werkzeug/local.py", line 328, in __bool__ return bool(self._get_current_object()) File "/usr/local/lib/python2.7/dist-packages/werkzeug/local.py", line 306, in _get_current_object return self.__local() File "/usr/local/lib/python2.7/dist-packages/flask/logging.py", line 37, in _proxy_stream ctx = _request_ctx_stack.top AttributeError: 'NoneType' object has no attribute 'top' Error in sys.exitfunc: Traceback (most recent call last): File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/usr/lib/python2.7/logging/__init__.py", line 1653, in shutdown h.flush() File "/usr/lib/python2.7/logging/__init__.py", line 834, in flush if self.stream and hasattr(self.stream, "flush"): File "/usr/local/lib/python2.7/dist-packages/werkzeug/local.py", line 328, in __bool__ return bool(self._get_current_object()) File "/usr/local/lib/python2.7/dist-packages/werkzeug/local.py", line 306, in _get_current_object return self.__local() File "/usr/local/lib/python2.7/dist-packages/flask/logging.py", line 37, in _proxy_stream ctx = _request_ctx_stack.top AttributeError: 'NoneType' object has no attribute 'top' ``` | 26 January 2018, 23:00:39 UTC |
| 9025e71 | Dave Eargle | 26 January 2018, 21:15:55 UTC | troubleshoot travis build pt3 | 26 January 2018, 21:15:55 UTC |
| 6fabfff | Dave Eargle | 26 January 2018, 21:09:23 UTC | troubleshooting travis build pt 2 | 26 January 2018, 21:09:23 UTC |
| 895d1e3 | Dave Eargle | 26 January 2018, 21:06:50 UTC | Update .travis.yml Troubleshooting travis build | 26 January 2018, 21:06:50 UTC |
| db0dbca | Dave Eargle | 26 January 2018, 18:21:06 UTC | Merge branch 'jacob-lee-urlfix' | 26 January 2018, 18:21:06 UTC |
| b7d75ef | Dave Eargle | 26 January 2018, 18:18:31 UTC | Merge branch 'urlfix' of https://github.com/jacob-lee/psiTurk into jacob-lee-urlfix | 26 January 2018, 18:18:31 UTC |
| 82854e4 | Dave Eargle | 26 January 2018, 18:14:47 UTC | Merge pull request #273 from jacob-lee/master Added confirmation dialog to hit_create() | 26 January 2018, 18:14:47 UTC |
| 15bab97 | Jacob Lee | 10 January 2018, 16:37:08 UTC | Change to Amazon MTurk HIT search URL Amazon has recently updated its worker interface. Among these changes is a change in the URL structure when searching for HITs: e.g. OLD: https://www.mturk.com/mturk/searchbar?selectedSearchType=hitgroups&searchWords=SearchTerm1+SearchTerm2+SearchTerm3 NEW: https://worker.mturk.com/projects?filters[search_term]=SearchTerm1+SearchTerm2+SearchTerm3 This commit simply reformts the url being rendered to the psiturk user. | 10 January 2018, 16:37:08 UTC |
| a97eb43 | Jacob Lee | 28 December 2017, 00:10:01 UTC | Merge ../psiturk-dev2 Merged requested fixes, and other incidental improvements, with existing pull request | 28 December 2017, 00:10:01 UTC |
| ac33be1 | Jacob Lee | 26 March 2017, 16:54:05 UTC | Added confirmation dialog to hit_create() * Implemented dialog confirmation as private method: _confirmDialog * Asks for confirmation before HIT is created. if 'no' or 'n', aborts creation of HIT. * Confirmation dialogue includes details of HIT * Respects quiet * Adds a private method to estimate the fee components * Makes the assignment to the mode variable in create_hit more sane. | 27 December 2017, 23:18:39 UTC |
| 4f41b23 | Dave Eargle | 15 December 2017, 00:20:04 UTC | enable require master workers. note that they cost an extra 5%, but this is not yet reflected in the price that psiturk reports. Closes #291 | 15 December 2017, 00:20:08 UTC |
| 28226c1 | Dave Eargle | 14 December 2017, 23:56:32 UTC | add number_hits_approved requirement | 14 December 2017, 23:56:32 UTC |
| 9da8db0 | Dave Eargle | 14 November 2017, 04:45:53 UTC | make shell more quiet when used in -e mode; fix handling of no workers found during bonusing | 14 November 2017, 04:45:53 UTC |
| ea825c5 | Dave Eargle | 07 November 2017, 23:40:28 UTC | make `worker bonus` respect chosen hit in querying. also only request one worker if only one assignemntid given | 07 November 2017, 23:40:28 UTC |
| 043274b | Dave Eargle | 07 November 2017, 23:34:06 UTC | worker_approve should call `get_worker` (new function) instead of `get_workers` if only given one assignmentId | 07 November 2017, 23:34:06 UTC |
| f26aed8 | Dave Eargle | 07 November 2017, 18:46:36 UTC | fix if statement | 07 November 2017, 18:46:36 UTC |
| f72df38 | Dave Eargle | 07 November 2017, 18:33:30 UTC | print styles for the consent form | 07 November 2017, 18:33:30 UTC |
| 2c73a79 | Dave Eargle | 07 November 2017, 18:30:19 UTC | If chosen_hit is provided, only query amt for that hit (don't loop over all existing hits) | 07 November 2017, 18:30:19 UTC |
| 44ece13 | Dave Eargle | 07 November 2017, 06:18:52 UTC | Merge pull request #283 from NYUCCL/approving_bonusing_improvements Approving, bonusing, and server improvements | 07 November 2017, 06:18:52 UTC |
| 1a58997 | Alex Rich | 31 October 2017, 17:59:03 UTC | updating documentation for new configuration settings | 31 October 2017, 17:59:03 UTC |
| 0a79863 | Alex Rich | 31 October 2017, 17:31:43 UTC | small fixes to "worker approve" Alert user when none of listed assignment id's are valid. If a worker appears as status "3" in the db and has submitted the task on MTurk, approve them. (Status "3" means completed but not submitted, which is wrong if they've actually submitted). | 31 October 2017, 17:31:43 UTC |
| 790d94c | Dave Eargle | 06 October 2017, 18:37:26 UTC | Merge branch 'master' of github.com:NYUCCL/psiTurk | 06 October 2017, 18:37:26 UTC |
| 90824f7 | Dave Eargle | 06 October 2017, 18:37:18 UTC | put favicon in more places, fix rel type | 06 October 2017, 18:37:18 UTC |
