| cb281fe | Todd Gureckis | 29 May 2014, 02:22:42 UTC | Merge remote-tracking branch 'origin/2.0.1_fixes' Conflicts: psiturk/version.py | 29 May 2014, 02:22:42 UTC |
| 2276a75 | Todd Gureckis | 29 May 2014, 02:18:53 UTC | stepping version number | 29 May 2014, 02:18:53 UTC |
| c10c2ba | Todd Gureckis | 27 May 2014, 14:04:30 UTC | update to contributors guide to mention pull requests going to dev | 29 May 2014, 02:18:15 UTC |
| 9de9a2d | Todd Gureckis | 30 April 2014, 23:30:48 UTC | accommodating full version number (with minor changes) | 29 May 2014, 02:18:15 UTC |
| dcc29c3 | Todd Gureckis | 22 May 2014, 22:25:47 UTC | changing instructions to reference gnureadline | 29 May 2014, 01:52:20 UTC |
| 003df0a | Todd Gureckis | 19 May 2014, 14:45:21 UTC | switch to gnureadline | 29 May 2014, 01:51:44 UTC |
| fd1d68b | Alex Rich | 27 May 2014, 21:31:25 UTC | fix bonusing issue If multiple workers tried same assignment, only gets database entry for the one who completed the hit Conflicts: psiturk/psiturk_shell.py | 29 May 2014, 00:45:31 UTC |
| 5d7d950 | Alex Rich | 09 May 2014, 19:20:46 UTC | subtle change in command docstrings to fix hit expire docopt wasn't parsing command as expected, causing all "hit extend" commands to extend assignments, not time. Added parentheses around pairs of optional parameters that have to appear together to fix the problem. Fixed similar problem in worker list, though don't think earlier version caused problems in this case. | 29 May 2014, 00:43:59 UTC |
| 7615c76 | Anna Coenen | 07 May 2014, 22:20:24 UTC | fixed typo from earlier commit | 29 May 2014, 00:43:51 UTC |
| 6e93326 | Anna Coenen | 07 May 2014, 16:48:16 UTC | added to bonus status code fix | 29 May 2014, 00:43:45 UTC |
| cdb0dee | Anna Coenen | 07 May 2014, 16:43:42 UTC | fix bonus status code (should be 7) and counterbalancing criteria | 29 May 2014, 00:42:51 UTC |
| 0741263 | Jay B. Martin | 28 May 2014, 20:33:10 UTC | Fix health badge | 28 May 2014, 20:33:10 UTC |
| efc2e91 | Jay B. Martin | 12 May 2014, 13:17:44 UTC | Revert "Include logger example for custom routes" This reverts commit 5a34ac4047eb7a496b6e8cbe59da869e0f013516. | 12 May 2014, 13:17:44 UTC |
| 5a34ac4 | Jay B. Martin | 12 May 2014, 01:00:43 UTC | Include logger example for custom routes | 12 May 2014, 01:00:43 UTC |
| bcd7694 | Jay B. Martin | 30 April 2014, 19:58:25 UTC | Update citation | 30 April 2014, 19:58:25 UTC |
| 2f7552a | Alex Rich | 28 April 2014, 12:25:29 UTC | Fixed dead link on readthedocs | 28 April 2014, 12:25:29 UTC |
| 8c6487f | Todd Gureckis | 28 April 2014, 04:05:11 UTC | record current stable version | 28 April 2014, 04:05:11 UTC |
| b8441b0 | Todd Gureckis | 28 April 2014, 04:03:28 UTC | bumping version number | 28 April 2014, 04:03:28 UTC |
| 38f499e | Todd Gureckis | 28 April 2014, 04:01:32 UTC | updating indicators to use master branch travis, coveralls, etc... | 28 April 2014, 04:01:32 UTC |
| 4bbe3e7 | Todd Gureckis | 28 April 2014, 03:42:30 UTC | Merge remote-tracking branch 'origin/dev' Conflicts: .travis.yml CONTRIBUTING.md README.md psiturk/dashboard_server.py psiturk/experiment.py psiturk/static_dashboard/js/templates/sidebar.html psiturk/static_example/js/task.js psiturk/templates_example/error.html requirements.txt setup.py | 28 April 2014, 03:42:30 UTC |
| 1a69747 | Todd Gureckis | 28 April 2014, 03:24:36 UTC | version 2.0 - release candidate 1 | 28 April 2014, 03:24:36 UTC |
| 298c67d | Todd Gureckis | 28 April 2014, 03:22:54 UTC | Merge remote-tracking branch 'origin/modeify_server' into dev | 28 April 2014, 03:22:54 UTC |
| b12e513 | Todd Gureckis | 27 April 2014, 19:02:01 UTC | removing references to dev.psiturk.org in the docs | 27 April 2014, 19:02:01 UTC |
| 2fc06da | Alex Rich | 26 April 2014, 22:04:53 UTC | Make '{worker, hit} list' use flags consistently Now options like "reviewable", "active", etc. are written as flags with "--" in front instead of just words for consistency with all the other commands. Closes #71. Jay, you're welcome ;) | 26 April 2014, 22:04:53 UTC |
| 80cdd9d | Alex Rich | 26 April 2014, 21:42:14 UTC | Change docs for Shell Parameters config | 26 April 2014, 21:42:14 UTC |
| a0574b5 | Alex Rich | 26 April 2014, 21:31:50 UTC | Add launch_in_sandbox_mode config option Defaults to true. Replaces always_launch_in_sandbox option | 26 April 2014, 21:31:50 UTC |
| 01dc1cb | Todd Gureckis | 26 April 2014, 15:25:14 UTC | stepping version number due to change in config.txt file the previous merge resolve the issue with the test failing | 26 April 2014, 15:25:31 UTC |
| 5333de0 | Todd Gureckis | 26 April 2014, 15:24:41 UTC | Merge remote-tracking branch 'origin/dev' into modeify_server Conflicts: psiturk/experiment.py | 26 April 2014, 15:24:41 UTC |
| 9376827 | Todd Gureckis | 26 April 2014, 15:04:18 UTC | updating docs to reflect this change | 26 April 2014, 15:04:18 UTC |
| 82c3053 | Todd Gureckis | 26 April 2014, 11:31:50 UTC | links should reference .html not .rst | 26 April 2014, 11:31:50 UTC |
| 1724e81 | Todd Gureckis | 26 April 2014, 11:27:38 UTC | cross referencing open shift docs | 26 April 2014, 11:27:44 UTC |
| 470e8be | Patricia | 25 April 2014, 23:24:19 UTC | Updated docs with new instructions to get AWS keys Amazon Web Services moved the security credentials to the AWS Management Console at https://console.aws.amazon.com. Also as of April 21, 2014, the AWS secret access key can no longer be retrieved after the keys are created. The docs has been updated with new instructions on how to create and obtain the AWS access keys. And there are pictures. | 25 April 2014, 23:24:19 UTC |
| e39278a | annacoenen | 25 April 2014, 22:45:46 UTC | small change | 25 April 2014, 22:45:46 UTC |
| e1b4be1 | Anna Coenen | 25 April 2014, 22:41:58 UTC | Merge branch 'dev' of github.com:NYUCCL/psiTurk into dev | 25 April 2014, 22:41:58 UTC |
| 4eda81f | Anna Coenen | 25 April 2014, 22:41:02 UTC | Merge branch 'OpenShiftCompatible' of github.com:NYUCCL/psiTurk into dev | 25 April 2014, 22:41:02 UTC |
| 9659a28 | Anna Coenen | 25 April 2014, 22:40:45 UTC | Added basic OpenShift instructions to docs | 25 April 2014, 22:40:45 UTC |
| fc8ecca | Alex Rich | 25 April 2014, 21:03:36 UTC | Remove using_sandbox from config Instead, whether sandbox mode is in use gets passed as an argument to the server subprocess and then down to the flask app. Seems to be working but there are a bunch of files I changed here so some more eyes would be good. Right now shell just starts in sandbox automatically. We could change that and turn the"always_launch_in_sandbox" config option into a "launch_in_sandbox_or_live" type option, or just remove the option. | 25 April 2014, 21:03:36 UTC |
| 0d78bc6 | Todd Gureckis | 25 April 2014, 18:36:19 UTC | minor clarifications to example code | 25 April 2014, 18:36:19 UTC |
| bbb480f | Todd Gureckis | 25 April 2014, 18:35:59 UTC | more general way to lookup ads via hitid (covers both types of ads) | 25 April 2014, 18:35:59 UTC |
| 2966d3d | Anna Coenen | 25 April 2014, 15:39:31 UTC | send adserver to OpenShift address | 25 April 2014, 15:39:31 UTC |
| 2b6d61d | Anna Coenen | 25 April 2014, 03:20:08 UTC | forgot to change variable... | 25 April 2014, 03:20:08 UTC |
| ba50f84 | Anna Coenen | 25 April 2014, 02:57:07 UTC | small change | 25 April 2014, 02:57:07 UTC |
| 6c70a29 | Anna Coenen | 25 April 2014, 02:53:14 UTC | Change path for .psiturkconfig when using OpenShift | 25 April 2014, 02:53:14 UTC |
| a6c1971 | Todd Gureckis | 25 April 2014, 02:45:04 UTC | updated image on README | 25 April 2014, 02:48:43 UTC |
| 96ec5f1 | Alex Rich | 23 April 2014, 19:07:34 UTC | Typo in docs | 23 April 2014, 19:07:34 UTC |
| ef1b422 | Alex Rich | 22 April 2014, 21:23:55 UTC | Documentation on how to get data from the database Closes issue #82 | 22 April 2014, 21:25:22 UTC |
| 15a879c | Todd Gureckis | 22 April 2014, 15:21:28 UTC | stepping version number again so it matches the tag. oops. | 22 April 2014, 15:21:28 UTC |
| e68610e | Alex Rich | 22 April 2014, 14:06:30 UTC | Fix typos in example experiment Change "next" to "text", fix issue where both questionnaire questions saved as "engagement" | 22 April 2014, 14:06:30 UTC |
| 058c139 | Todd Gureckis | 19 April 2014, 22:18:45 UTC | minor update to example - makes things cleaner on the psiturk.org ad group listing site | 20 April 2014, 19:41:26 UTC |
| af98f58 | Todd Gureckis | 19 April 2014, 15:49:54 UTC | new status code submitted (but not credited) deals better with people who finish but may not have hit the "complete hit" button yet. | 19 April 2014, 15:49:54 UTC |
| 12e5dfe | Todd Gureckis | 19 April 2014, 04:56:23 UTC | the cause of the double counting of "accepts" on ad server - this function was executing when the popup window opened. this triggered a reload the AMT page and a double count of the "accept". - this is not necessary since the ad server handles this reload thing itself when the user completes the hit. | 19 April 2014, 04:56:23 UTC |
| 8e486f8 | Todd Gureckis | 19 April 2014, 04:51:59 UTC | adding separate support for sandboxed ads to the psiturk experiment server | 19 April 2014, 04:51:59 UTC |
| 8603dcd | Todd Gureckis | 19 April 2014, 04:15:43 UTC | stepping version number change in the way sandboxed ads are handled seems important enough | 19 April 2014, 04:16:36 UTC |
| 0022953 | Todd Gureckis | 19 April 2014, 04:06:02 UTC | separates sandboxed and regular ads on the ad server | 19 April 2014, 04:16:35 UTC |
| f711b4f | Jay B. Martin | 18 April 2014, 22:34:05 UTC | Reduce health-checking strictness | 18 April 2014, 22:34:05 UTC |
| c66afc9 | Todd Gureckis | 18 April 2014, 16:33:58 UTC | fixes bug in importing custom models in previous commit | 18 April 2014, 16:33:58 UTC |
| cf0c9c5 | Todd Gureckis | 18 April 2014, 01:49:34 UTC | Merge branch 'refs/heads/expxchange_commandline_tool' into dev | 18 April 2014, 01:49:34 UTC |
| 66add32 | Todd Gureckis | 18 April 2014, 01:47:21 UTC | adding support for custom models | 18 April 2014, 01:47:21 UTC |
| 550a830 | Todd Gureckis | 17 April 2014, 19:03:26 UTC | clarifies running on remote server.. closes #63 | 17 April 2014, 19:03:26 UTC |
| ba2bf56 | Todd Gureckis | 17 April 2014, 18:15:22 UTC | support for download experiment from the exchange just uses git basically but also interfaces with the API to record # of downloads, etc... command is `psiturk-install` and instructions about its use are provided on each of the individual experiment exchange pages (e.g., http://dev.psiturk.org/ee/HW3XfPCTUjPDdtE87aHRHi) | 17 April 2014, 18:15:22 UTC |
| 26ecde9 | Todd Gureckis | 17 April 2014, 15:41:52 UTC | formatting fix was printing out weird | 17 April 2014, 15:41:52 UTC |
| 8195852 | Todd Gureckis | 16 April 2014, 18:23:24 UTC | local thanks page needed when reloading the local ad and a worker has already completed the task. - this file was deleted but is actually needed | 16 April 2014, 18:23:24 UTC |
| 9128260 | Todd Gureckis | 16 April 2014, 18:19:54 UTC | closes #85 student in class pointed out stimuli not shuffled in example. according to underscore.js docs, the shuffle is not "in place". this fixes it. | 16 April 2014, 18:19:54 UTC |
| 410718e | Todd Gureckis | 05 April 2014, 17:34:23 UTC | updated 'endhit' database field when in debug mode | 09 April 2014, 20:54:25 UTC |
| 9c93932 | Todd Gureckis | 05 April 2014, 16:30:55 UTC | reinstating @patriciachan's documentation edits | 09 April 2014, 20:54:25 UTC |
| 93d8e6c | Jay B. Martin | 04 April 2014, 15:44:27 UTC | Display license badge. | 08 April 2014, 06:14:15 UTC |
| ab32dab | Jay B. Martin | 04 April 2014, 15:29:37 UTC | Stop monitoring doc dir for health status. | 08 April 2014, 06:14:15 UTC |
| 046b4b7 | Jay B. Martin | 04 April 2014, 15:12:01 UTC | Notify authors on build fail (or status change) | 08 April 2014, 06:14:15 UTC |
| d195b37 | Anna Coenen | 05 April 2014, 19:06:13 UTC | fixed accidental global variables created by psiturk.js psiturk.js created some (I believe) unwanted global variables, like "data" and "qd". These might conflict with the user's own. | 05 April 2014, 19:06:13 UTC |
| 44e7dd9 | Jay B. Martin | 04 April 2014, 15:12:55 UTC | Notify authors on build fail (or status change) | 04 April 2014, 15:12:55 UTC |
| 28f6a4f | Todd Gureckis | 03 April 2014, 00:02:26 UTC | Merge remote-tracking branch 'origin/stroop_example' into dev | 03 April 2014, 00:02:26 UTC |
| 9531371 | Todd Gureckis | 03 April 2014, 00:01:57 UTC | license file | 03 April 2014, 00:01:57 UTC |
| 60e1f86 | Todd Gureckis | 02 April 2014, 19:40:13 UTC | updating docs | 02 April 2014, 19:40:13 UTC |
| 6747b21 | Todd Gureckis | 02 April 2014, 19:37:41 UTC | fixes up the ad so it displays properly on AMT site - ad was not displaying since CSS files can't be loaded via http:// when the enclosing page is https:// - task.js had some weird stuff/layout issues that i found hard to explain in class when stepping through example | 02 April 2014, 19:37:41 UTC |
| f46fced | Todd Gureckis | 02 April 2014, 02:22:13 UTC | error email address in example error template | 02 April 2014, 02:22:13 UTC |
| 5b008a3 | Todd Gureckis | 02 April 2014, 02:16:52 UTC | style points for landscape.io | 02 April 2014, 02:16:52 UTC |
| fdcdd26 | Todd Gureckis | 02 April 2014, 02:16:35 UTC | updates to error handling - will show the configured contact_email_on_error when an internal error is generated (matching more how things are done in the ad server) | 02 April 2014, 02:16:35 UTC |
| 1c1d773 | Todd Gureckis | 02 April 2014, 02:02:42 UTC | correct way to run webserver standalone | 02 April 2014, 02:02:42 UTC |
| 2303c2c | Todd Gureckis | 02 April 2014, 01:38:23 UTC | Merge remote-tracking branch 'origin/stroop_example' into dev | 02 April 2014, 01:38:23 UTC |
| 5d159fe | Todd Gureckis | 02 April 2014, 01:37:53 UTC | fixes the test that is failing | 02 April 2014, 01:37:53 UTC |
| 6d06171 | Todd Gureckis | 01 April 2014, 21:18:16 UTC | updating CSS paths to work on ad server | 01 April 2014, 21:18:16 UTC |
| dd8ce80 | Todd Gureckis | 01 April 2014, 14:24:31 UTC | updated error page - boostrapped | 01 April 2014, 14:24:31 UTC |
| c95df03 | Todd Gureckis | 01 April 2014, 03:42:37 UTC | don't mark quitters in debug mode, don't block ads in debug mode | 01 April 2014, 03:42:37 UTC |
| 26bcf75 | Todd Gureckis | 01 April 2014, 03:19:03 UTC | file no longer exists, can't be preloaded | 01 April 2014, 03:19:03 UTC |
| 4d924c4 | Todd Gureckis | 01 April 2014, 02:35:54 UTC | some typos, etc... | 01 April 2014, 02:35:54 UTC |
| e913196 | Todd Gureckis | 01 April 2014, 02:32:02 UTC | conceptual information about experiment structure | 01 April 2014, 02:32:02 UTC |
| 164c132 | Todd Gureckis | 01 April 2014, 02:26:16 UTC | updates to docs referencing debugging mode - making a small change to the way the /inexp route is handled. previously this route was basically ignored when running in debug mode. however, the /exp route already ignores the meaning of the database status field when in debugging mode. Thus, i think it makes more sense for everything to proceed as normal and to just ignore the usual safety checks re: restarting experiment mid-way rather than hacking the status codes to force this behavior. | 01 April 2014, 02:26:16 UTC |
| 78d64a7 | Todd Gureckis | 31 March 2014, 21:48:51 UTC | updates/first draft to the documentation of the simple "stroop" example | 31 March 2014, 21:48:51 UTC |
| 4eace11 | Todd Gureckis | 31 March 2014, 21:29:51 UTC | more helpful error message - directs people to set host to `0.0.0.0` (easier than knowing your ip address) | 31 March 2014, 21:29:51 UTC |
| a9595f6 | Todd Gureckis | 31 March 2014, 20:47:30 UTC | documenting changes to psiTurk.js object, including the doInstructions() method | 31 March 2014, 20:47:37 UTC |
| 975e11c | Todd Gureckis | 31 March 2014, 20:13:10 UTC | update docs for new example directory structure | 31 March 2014, 20:13:10 UTC |
| a3a1112 | Todd Gureckis | 31 March 2014, 15:59:49 UTC | should mention error messages in the docs | 31 March 2014, 15:59:49 UTC |
| c852973 | Todd Gureckis | 31 March 2014, 15:54:04 UTC | stepping version number since psiturk.js has major changes | 31 March 2014, 15:58:20 UTC |
| 618e4a0 | Todd Gureckis | 31 March 2014, 15:53:51 UTC | major updates to the stroop example - bootstrapped all the CSS. this way CSS isn't a mystery novel of weird conventions. read getbootstrap.com for more info - nicer looking templates - documented some of the templates better inside comments - instructions now use the psiturk Instruction() object which steps though multiple pages of instructions - simplified task a bit and made it look nicer (uses d3.js now) - made completeHIT() be a part of the psiturk object itself. | 31 March 2014, 15:58:20 UTC |
| e15d8e7 | Todd Gureckis | 31 March 2014, 15:48:02 UTC | gets rid of error messages that was appear and end of debug sequence | 31 March 2014, 15:58:20 UTC |
| 18a8d8c | Todd Gureckis | 31 March 2014, 15:47:26 UTC | d3 instead of raphael more hipster | 31 March 2014, 15:58:20 UTC |
| a4cbec3 | Todd Gureckis | 31 March 2014, 15:47:14 UTC | updates to style files - interfaces better with Bootstrap | 31 March 2014, 15:58:20 UTC |
| 2b2942e | Todd Gureckis | 31 March 2014, 15:46:48 UTC | bootstrapped | 31 March 2014, 15:58:20 UTC |
| d2b0043 | Todd Gureckis | 31 March 2014, 15:46:36 UTC | generic university logo (invites replacement instead of tarnishing NYU's name) - also deletes some unused graphics (why distribute these unused files, confusing) | 31 March 2014, 15:58:20 UTC |
| 8124cde | Alex Rich | 20 March 2014, 15:29:36 UTC | Add retrieving data doc page and modify recording data page | 20 March 2014, 15:29:36 UTC |
