| 6c7e2fb | Todd Gureckis | 23 July 2014, 01:15:18 UTC | Merge remote-tracking branch 'origin/dev' | 23 July 2014, 01:15:18 UTC |
| a07132e | Jay B. Martin | 22 July 2014, 06:39:59 UTC | Merge branch 'openshift-patch' into dev | 22 July 2014, 06:39:59 UTC |
| 95b7757 | Jay B. Martin | 22 July 2014, 04:06:30 UTC | Patch OpenShift psutil bug | 22 July 2014, 06:35:18 UTC |
| 1cf9ae9 | Todd Gureckis | 22 July 2014, 03:50:16 UTC | updated to docs where is the psiturk.js file? | 22 July 2014, 03:50:39 UTC |
| 759f86b | Todd Gureckis | 21 July 2014, 17:54:59 UTC | updating version numbers | 21 July 2014, 17:54:59 UTC |
| b109b3d | Todd Gureckis | 21 July 2014, 17:53:58 UTC | Merge remote-tracking branch 'origin/dev' Conflicts: README.md psiturk/experiment.py psiturk/psiturk_shell.py psiturk/version.py setup.py | 21 July 2014, 17:53:58 UTC |
| 96b3096 | Doug Markant | 21 July 2014, 11:43:46 UTC | Update install.rst | 21 July 2014, 11:43:46 UTC |
| 768752d | Jay B. Martin | 21 July 2014, 05:52:00 UTC | Fix CLI string format | 21 July 2014, 05:52:00 UTC |
| 44aa939 | Todd Gureckis | 20 July 2014, 20:26:40 UTC | some initial placeholder for tunnel docs | 20 July 2014, 20:26:40 UTC |
| 925d791 | Todd Gureckis | 19 July 2014, 20:31:31 UTC | makes psiturk.js aware of the current mode (and allows refreshing the browser at any point in debug mode). | 19 July 2014, 20:31:31 UTC |
| ff93808 | ebbinghaus | 19 July 2014, 17:29:39 UTC | add new accessor function to main psiturk object this allows public access to the function defined in previous commit. | 19 July 2014, 17:29:39 UTC |
| ba2f8fd | ebbinghaus | 19 July 2014, 17:22:37 UTC | add methods for accessing current data allows experimenter to access current values of data field inside the psiturk object via javascript. | 19 July 2014, 17:22:37 UTC |
| 1c1a3e3 | ebbinghaus | 19 July 2014, 17:13:28 UTC | make psiTurk object available as global variable the keyword new means that you can access psiTurk object via the developer's tools (helpful for debugging) | 19 July 2014, 17:13:28 UTC |
| 13195a5 | Todd Gureckis | 18 July 2014, 18:58:00 UTC | change from POST to DELETE - removed unnecessary data argument to DELETE note: the DELETE request returns the new hostname if needed | 18 July 2014, 18:58:00 UTC |
| a0681f7 | Jay B. Martin | 18 July 2014, 10:31:49 UTC | Prevent non-existent tunnel from being closed | 18 July 2014, 10:31:49 UTC |
| 185d472 | Jay B. Martin | 18 July 2014, 10:25:40 UTC | Personalize tunnel URLs - Access personal tunnel URLs via psiturk.org API - Add 'tunnel change' command to CLI - @gureckis: tunnel change currently uses POST. DELETE not allowed. | 18 July 2014, 10:25:40 UTC |
| bf63e35 | Jay B. Martin | 18 July 2014, 05:15:17 UTC | Remove default tunnel status on CLI | 18 July 2014, 05:15:17 UTC |
| c02c1f2 | Todd Gureckis | 02 July 2014, 00:56:58 UTC | Merge pull request #115 from pfeyz/throw-error-on-missing-page-2 throw error when page is loaded without preloading | 02 July 2014, 00:56:58 UTC |
| 28fc515 | Paul Feitzinger | 01 July 2014, 03:37:12 UTC | throw error when page is loaded without preloading | 01 July 2014, 18:00:00 UTC |
| d647cd9 | Todd Gureckis | 26 June 2014, 02:31:52 UTC | Merge pull request #112 from jhamrick/fetch-taskdata Add separate route to fetch taskdata | 26 June 2014, 02:31:52 UTC |
| 28c8b15 | Todd Gureckis | 26 June 2014, 02:29:35 UTC | Merge pull request #113 from jhamrick/fix-whitespace-in-tests Fixup whitespace and line lengths | 26 June 2014, 02:29:35 UTC |
| 5b71ed7 | Jessica B. Hamrick | 23 June 2014, 01:23:39 UTC | Fixup whitespace and line lengths | 23 June 2014, 01:23:39 UTC |
| d6c507c | Jessica B. Hamrick | 23 June 2014, 00:55:01 UTC | Add tests for getting and putting via sync | 23 June 2014, 00:55:01 UTC |
| f48ac60 | Jessica B. Hamrick | 22 June 2014, 06:21:36 UTC | Add separate route for fetching taskdata model state | 22 June 2014, 23:43:16 UTC |
| 2acb6b5 | Todd Gureckis | 16 June 2014, 17:06:34 UTC | Merge pull request #107 from jhamrick/log-error-messages Log experiment error messages | 16 June 2014, 17:06:34 UTC |
| e6dc37d | Todd Gureckis | 16 June 2014, 17:05:11 UTC | Merge pull request #110 from pfeyz/fix-doInstructions fix typo, psiTurk -> psiturk | 16 June 2014, 17:05:11 UTC |
| 406a6ac | Paul Feitzinger | 10 June 2014, 14:27:51 UTC | fix typo, psiTurk -> psiturk | 10 June 2014, 14:27:51 UTC |
| 7ba5ac3 | Jessica B. Hamrick | 08 June 2014, 22:07:44 UTC | Log experiment error messages | 08 June 2014, 22:07:44 UTC |
| 91637a4 | Jay B. Martin | 03 June 2014, 17:46:46 UTC | Fix import bug caused by refactor | 03 June 2014, 17:46:46 UTC |
| cecb845 | Jay B. Martin | 03 June 2014, 16:14:06 UTC | Refactor | 03 June 2014, 16:18:07 UTC |
| 7ab43f6 | Jay B. Martin | 03 June 2014, 15:26:57 UTC | Refactor | 03 June 2014, 16:18:07 UTC |
| e7a3970 | Jay B. Martin | 03 June 2014, 15:12:30 UTC | Refactor | 03 June 2014, 16:18:07 UTC |
| 0322e73 | Jay B. Martin | 03 June 2014, 14:57:32 UTC | Bump stable version number | 03 June 2014, 14:57:32 UTC |
| 4f3c8f8 | Jay B. Martin | 03 June 2014, 14:51:11 UTC | Refactor | 03 June 2014, 14:51:11 UTC |
| aef165b | Jay B. Martin | 03 June 2014, 14:04:08 UTC | Increase experiment.py coverage Refactor | 03 June 2014, 14:43:21 UTC |
| 194184f | Jay B. Martin | 29 May 2014, 08:03:15 UTC | Stop authors from getting Travis updates | 29 May 2014, 08:03:15 UTC |
| dea02fd | Jay B. Martin | 29 May 2014, 08:02:53 UTC | Stop authors from getting Travis updates | 29 May 2014, 08:02:53 UTC |
| 525ca5e | Jay B. Martin | 29 May 2014, 07:54:40 UTC | Refactor | 29 May 2014, 07:54:40 UTC |
| 9713e07 | Jay B. Martin | 29 May 2014, 07:43:18 UTC | Refactor | 29 May 2014, 07:43:18 UTC |
| 9055102 | Jay B. Martin | 29 May 2014, 06:49:50 UTC | Refactor | 29 May 2014, 06:49:50 UTC |
| 709af54 | Todd Gureckis | 29 May 2014, 02:52:43 UTC | why the test is failing | 29 May 2014, 02:52:43 UTC |
| bd0552e | Todd Gureckis | 29 May 2014, 02:40:59 UTC | differentiating versions | 29 May 2014, 02:40:59 UTC |
| f3cf783 | Todd Gureckis | 29 May 2014, 02:26:47 UTC | update stable version | 29 May 2014, 02:26:47 UTC |
| 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 |
| 69981bf | Jay B. Martin | 28 May 2014, 21:35:48 UTC | Refactor according to pylint | 28 May 2014, 21:38:02 UTC |
| 0741263 | Jay B. Martin | 28 May 2014, 20:33:10 UTC | Fix health badge | 28 May 2014, 20:33:10 UTC |
| 651b6ee | Jay B. Martin | 28 May 2014, 20:32:23 UTC | Fix badges | 28 May 2014, 20:32:23 UTC |
| fe1b688 | Jay B. Martin | 28 May 2014, 19:58:42 UTC | Refactor using landscape.io's suggestions | 28 May 2014, 19:58:42 UTC |
| 7b9ab2e | Jay B. Martin | 28 May 2014, 19:41:39 UTC | Refactor following pylint | 28 May 2014, 19:41:39 UTC |
| 32c95db | 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 | 27 May 2014, 21:49:08 UTC |
| cf8d64a | Jay B. Martin | 27 May 2014, 21:31:01 UTC | Merge branch 'de-modeify-server' into dev | 27 May 2014, 21:31:01 UTC |
| 6b6238b | Todd Gureckis | 27 May 2014, 18:52:06 UTC | require a newer version of psutil on install addresses issue #93 | 27 May 2014, 19:59:59 UTC |
| 960b45d | Todd Gureckis | 27 May 2014, 18:52:06 UTC | require a newer version of psutil on install addresses issue #93 | 27 May 2014, 18:52:06 UTC |
| ebae15d | Jay B. Martin | 27 May 2014, 18:24:30 UTC | Remove sandbox from server.startup calls | 27 May 2014, 18:24:30 UTC |
| ad7117b | Jay B. Martin | 27 May 2014, 18:13:35 UTC | Merge dev updates | 27 May 2014, 18:13:35 UTC |
| 3536c2a | Jay B. Martin | 27 May 2014, 17:07:57 UTC | Revert "Enable easy ad and api server debugging via config" This reverts commit 7349612fc9b64afc383cf5854c87306402f126d8. | 27 May 2014, 17:07:57 UTC |
| f535c09 | Jay B. Martin | 27 May 2014, 15:24:16 UTC | Prevent server command from hanging. - Also, provide better feedback on server status | 27 May 2014, 15:24:16 UTC |
| 0cc983c | Jay B. Martin | 27 May 2014, 14:47:48 UTC | Patch server poll memory leak | 27 May 2014, 14:49:03 UTC |
| d948db3 | Michael Chow | 21 May 2014, 19:24:43 UTC | Fix imports, missing variables in example | 27 May 2014, 13:59:15 UTC |
| 655e220 | Jay B. Martin | 27 May 2014, 08:44:40 UTC | Catch `server off` call when server is already off | 27 May 2014, 08:44:40 UTC |
| c099d07 | Jay B. Martin | 27 May 2014, 08:18:41 UTC | Improve experiment server stability and status | 27 May 2014, 08:18:41 UTC |
| ebd8070 | Jay B. Martin | 27 May 2014, 06:56:42 UTC | Update imports | 27 May 2014, 06:56:42 UTC |
| 492b90f | Jay B. Martin | 27 May 2014, 06:20:00 UTC | Tear down tunnel on server off and server restart | 27 May 2014, 06:20:00 UTC |
| c106450 | Jay B. Martin | 27 May 2014, 06:00:00 UTC | Indicate tunnel status in CLI prompt | 27 May 2014, 06:00:00 UTC |
| 3bec040 | Jay B. Martin | 27 May 2014, 05:50:58 UTC | Move tunnel methods into PsiturkNetworkShell class | 27 May 2014, 05:50:58 UTC |
| 6fe5dc1 | Jay B. Martin | 27 May 2014, 05:49:49 UTC | Gracefully handle abrupt keyboard interruptions | 27 May 2014, 05:49:49 UTC |
| 9d6b943 | Jay B. Martin | 27 May 2014, 05:46:28 UTC | Kill tunnel processes without privilages | 27 May 2014, 05:46:28 UTC |
| 5fbf4e7 | Jay B. Martin | 27 May 2014, 02:55:12 UTC | Remove stat dependency | 27 May 2014, 02:55:12 UTC |
| 95f58ee | Jay B. Martin | 26 May 2014, 22:22:56 UTC | Fix ngrok permission issue | 26 May 2014, 22:22:56 UTC |
| 86a9b13 | Todd Gureckis | 26 May 2014, 22:14:06 UTC | tunnel needs to be in the MANIFEST.in for setuptools | 26 May 2014, 22:14:06 UTC |
| fa19337 | Todd Gureckis | 22 May 2014, 22:26:07 UTC | don't need a new empty directory since psiturk makes a new folder for you | 26 May 2014, 21:57:53 UTC |
| 5b5fb57 | Todd Gureckis | 22 May 2014, 22:25:47 UTC | changing instructions to reference gnureadline | 26 May 2014, 21:57:53 UTC |
| 23e5718 | Todd Gureckis | 19 May 2014, 14:44:55 UTC | add patricia's doc contributions | 26 May 2014, 21:57:52 UTC |
| 931b904 | Todd Gureckis | 19 May 2014, 14:40:44 UTC | stepping version in dev | 26 May 2014, 21:57:52 UTC |
| d16960f | Jay B. Martin | 26 May 2014, 21:50:37 UTC | Include tunnel in fuzzy-match | 26 May 2014, 21:50:37 UTC |
| 0572d32 | Jay B. Martin | 26 May 2014, 21:47:05 UTC | Merge branch 'tunnel' into dev | 26 May 2014, 21:47:05 UTC |
| b8b0658 | Jay B. Martin | 26 May 2014, 18:03:57 UTC | Point tunnel at tunnel.psiturk.org | 26 May 2014, 18:03:57 UTC |
| bb452dd | Jay B. Martin | 26 May 2014, 16:34:44 UTC | Provide tunnel URL to ad server - Refactor Tunnel module into psiturk_org_services.py | 26 May 2014, 16:38:04 UTC |
| a6e3da1 | Jay B. Martin | 26 May 2014, 02:00:55 UTC | Add fuzzy match suggestion for mistyped commands | 26 May 2014, 02:00:55 UTC |
| 1c28c73 | Jay B. Martin | 24 May 2014, 09:34:25 UTC | Remove print statements from debugging | 24 May 2014, 09:34:25 UTC |
| 9f2c5b4 | Jay B. Martin | 24 May 2014, 09:30:49 UTC | Improve tunnel commands in shell | 24 May 2014, 09:30:49 UTC |
| bcfd8ed | Jay B. Martin | 24 May 2014, 09:04:02 UTC | Tunnel through firewalls - This commit adds: - a tunnel client - psiturk_tunnel module to wrap the client - basic tunnel commands (open, close) to the psiturk_shell | 24 May 2014, 09:04:02 UTC |
| a9026a4 | Todd Gureckis | 19 May 2014, 14:45:21 UTC | switch to gnureadline | 22 May 2014, 22:00:47 UTC |
| 856c5b0 | Jay B. Martin | 22 May 2014, 21:06:39 UTC | Post MTurk HIT URL on HIT creation | 22 May 2014, 21:06:39 UTC |
| 88b5dcd | Jay B. Martin | 22 May 2014, 16:31:04 UTC | Print external URL when using debug --print-only - Using the --print-only option implies that the user is on a remote server, so providing a localhost URL is unhelpful. | 22 May 2014, 16:32:46 UTC |
| 87d10a7 | Jay B. Martin | 22 May 2014, 16:31:04 UTC | Print external URL when using debug --print-only - Using the --print-only option implies that the user is on a remote server, so providing a localhost URL is unhelpful. | 22 May 2014, 16:31:04 UTC |
| e40aa7a | Alex Rich | 21 May 2014, 18:56:59 UTC | fix indexing error in insert_mode | 21 May 2014, 18:59:32 UTC |
| 7837365 | Jay B. Martin | 21 May 2014, 18:58:49 UTC | Stop restarting server on mode change | 21 May 2014, 18:58:49 UTC |
| 7349612 | Jay B. Martin | 21 May 2014, 18:16:47 UTC | Enable easy ad and api server debugging via config | 21 May 2014, 18:16:47 UTC |
| b5dfc1c | Todd Gureckis | 19 May 2014, 14:45:21 UTC | switch to gnureadline | 21 May 2014, 17:17:09 UTC |
