| 413e06b | Jay Martin | 27 October 2013, 16:51:14 UTC | Merge commit '69f5ca907b16806533663f3f95cecaec0af46caf' # By Jessica B. Hamrick # Via Jessica B. Hamrick * commit '69f5ca907b16806533663f3f95cecaec0af46caf': Add dashboard parameters to enable dashboard authentication | 27 October 2013, 16:51:14 UTC |
| 6f08354 | Jay B. Martin | 22 October 2013, 17:09:36 UTC | Update README.md fix install link in quickstart | 22 October 2013, 17:09:36 UTC |
| 714b1c2 | Todd Gureckis | 22 October 2013, 16:56:17 UTC | simplifying a bit, caught some typos | 22 October 2013, 16:56:17 UTC |
| e813095 | Todd Gureckis | 22 October 2013, 11:10:42 UTC | gunicorn's import_app will search the correct path for the experiment.py application. fixes #47 | 22 October 2013, 11:10:42 UTC |
| 69f5ca9 | Jessica B. Hamrick | 22 October 2013, 04:40:18 UTC | Add dashboard parameters to enable dashboard authentication | 22 October 2013, 04:40:18 UTC |
| b9faa9f | Jay B. Martin | 22 October 2013, 01:51:48 UTC | update quickstart and formatting. | 22 October 2013, 01:51:48 UTC |
| 40e2fac | Jay B. Martin | 22 October 2013, 00:36:27 UTC | Merge pull request #45 from jhamrick/num-workers Add a server parameter config option for number of workers/threads | 22 October 2013, 00:36:27 UTC |
| 7e92775 | Jessica B. Hamrick | 18 October 2013, 20:49:04 UTC | Add a server parameter config option for number of workers/threads | 21 October 2013, 23:02:52 UTC |
| 327493e | Anna Coenen | 21 October 2013, 15:07:10 UTC | Added recordBonus function to psiturk.js | 21 October 2013, 15:07:10 UTC |
| 0f4d694 | Todd Gureckis | 19 October 2013, 02:31:04 UTC | typos, link to docs | 19 October 2013, 02:31:04 UTC |
| d82ebaf | Todd Gureckis | 18 October 2013, 21:57:05 UTC | Update README.md typo | 18 October 2013, 21:57:05 UTC |
| da29db4 | Todd Gureckis | 14 October 2013, 19:16:53 UTC | Merge pull request #44 from NYUCCL/dashboard/stability/server-toggle Various fixes | 14 October 2013, 19:16:53 UTC |
| fb6bf0d | Todd Gureckis | 14 October 2013, 19:12:22 UTC | Merge pull request #43 from jhamrick/dashboard/stability/server-toggle Handle user completion when debriefing is not being used | 14 October 2013, 19:12:22 UTC |
| 9b38112 | Jessica B. Hamrick | 14 October 2013, 19:07:37 UTC | Handle use completion when debriefing is not being used | 14 October 2013, 19:07:37 UTC |
| 20f1eb7 | Todd Gureckis | 08 October 2013, 16:18:16 UTC | Update README.md | 08 October 2013, 16:18:16 UTC |
| a2383ec | Todd Gureckis | 08 October 2013, 16:17:46 UTC | Update README.md added link to slides (some people had been asking for them in a viewable form aside from /doc) | 08 October 2013, 16:17:46 UTC |
| a12e7d3 | John McDonnell | 12 August 2013, 02:27:35 UTC | Merged branch 'dev' into master, including the dashboard, pypi integration, and considerable refactoring. | 12 August 2013, 02:27:35 UTC |
| fb7f21c | Jay B. Martin | 05 August 2013, 01:07:20 UTC | Improve server toggle and test btn stability - Remove doTimeout.js - Add bacon.js (functional reactive programming library) - Refactor monitorPsiTurkServer and pollPsiTurkServerStatus | 05 August 2013, 01:07:20 UTC |
| ab94812 | John McDonnell | 04 August 2013, 09:41:37 UTC | Revised dashboard launching code and moved appropriate parts to the experiment_server_controller | 04 August 2013, 09:41:37 UTC |
| d96597f | John McDonnell | 04 August 2013, 09:40:20 UTC | Dashboard host now optional and defaults to localhost, not 0.0.0.0 | 04 August 2013, 09:40:20 UTC |
| e2e026d | John McDonnell | 03 August 2013, 08:46:53 UTC | Changed dashboard back to local host | 03 August 2013, 08:46:53 UTC |
| 603efda | John McDonnell | 03 August 2013, 08:43:20 UTC | Made wait_until_online less insane. | 03 August 2013, 08:43:20 UTC |
| f5773f3 | John McDonnell | 03 August 2013, 08:42:53 UTC | Changed default config to reflect Stroop task. | 03 August 2013, 08:42:53 UTC |
| 7e224b1 | John McDonnell | 03 August 2013, 08:16:14 UTC | ExperimentConfig is now PsiturkConfig, more consistent naming scheme (since it is used for everything) | 03 August 2013, 08:16:14 UTC |
| 755be91 | John McDonnell | 31 July 2013, 11:12:54 UTC | Bumbed version. | 31 July 2013, 11:12:54 UTC |
| 005097d | John McDonnell | 31 July 2013, 11:12:21 UTC | Fixed merge error where server wouldn't launch | 31 July 2013, 11:12:21 UTC |
| 4f22b00 | John McDonnell | 31 July 2013, 07:29:29 UTC | Updated configuration instructions in README | 31 July 2013, 07:29:29 UTC |
| 02f3ec7 | John McDonnell | 31 July 2013, 06:47:25 UTC | Bumped version to 1.0 release! | 31 July 2013, 06:49:42 UTC |
| ccee7ee | John McDonnell | 31 July 2013, 06:46:25 UTC | Merge Jay's latest tweak branch 'final-cogsci-patch' into dev | 31 July 2013, 06:46:25 UTC |
| a219d64 | John McDonnell | 30 July 2013, 13:48:28 UTC | Consistently refer to 'counterbalance' as 'counterbalance' | 31 July 2013, 06:30:09 UTC |
| e6ae614 | Jay B. Martin | 31 July 2013, 00:04:20 UTC | improved on/off toggle | 31 July 2013, 00:04:20 UTC |
| 6742836 | Jay B. Martin | 30 July 2013, 23:19:58 UTC | fixed aws verify icon from not binding | 30 July 2013, 23:19:58 UTC |
| 5c9dcc2 | Jay B. Martin | 30 July 2013, 23:12:58 UTC | fixed css alignment and made branding consistant | 30 July 2013, 23:12:58 UTC |
| a2c324b | Jay B. Martin | 30 July 2013, 23:12:35 UTC | added use_debrief checkbox and fixed other checkbox bugs | 30 July 2013, 23:12:35 UTC |
| 59f3da4 | Jay B. Martin | 30 July 2013, 22:50:03 UTC | enabled external logger | 30 July 2013, 22:50:03 UTC |
| 2ea4329 | Jay B. Martin | 30 July 2013, 22:29:54 UTC | stop front end from causing broken pipe error | 30 July 2013, 22:29:54 UTC |
| 8633fb0 | Jay B. Martin | 30 July 2013, 22:23:23 UTC | disambiguated between expt and dashboard shutdown | 30 July 2013, 22:23:23 UTC |
| c7928ed | Jay B. Martin | 30 July 2013, 22:08:26 UTC | Merge branch 'cogsci-patch' into dev # By John McDonnell (9) and others * cogsci-patch: final feature additions and bug fixes; still some kinks with spotty internet connections that needs to be smoothed over. Added launch_log route to launch the server log in a gui program Issue #30: A few tweaks for pypi distribution. Instructed mac users to install XCode; also instruct how to install pip. Regarding Issue #3, Added use_debriefing option to skip debriefing step Removed link to Jay's NYU files Trying not to be too heavy-handed with the tagline Removed atavistic code. Fixed stylesheet for consent Cleanup of templates, removed legacy code from experiment.py kicking the can down the road on the log panel final features and bug fixes fixted test button not appearing bug and default pay tab bug initial release of accept/reject assignment feature. also, marks database as credited. Conflicts: psiturk/static_dashboard/js/app.js | 30 July 2013, 22:08:26 UTC |
| 8ee6d30 | John McDonnell | 29 July 2013, 20:35:57 UTC | Bumped version to beta | 29 July 2013, 20:35:57 UTC |
| 18c8bb0 | John McDonnell | 29 July 2013, 20:35:21 UTC | Stopped dashboard from asking for credentials every ten seconds | 29 July 2013, 20:35:21 UTC |
| 0ddf9e8 | John McDonnell | 29 July 2013, 07:55:24 UTC | Added launch_log route to launch the server log in a gui program | 29 July 2013, 07:55:24 UTC |
| bd84780 | John McDonnell | 29 July 2013, 07:39:14 UTC | Issue #30: A few tweaks for pypi distribution. | 29 July 2013, 07:39:23 UTC |
| 3fb3e3c | John McDonnell | 29 July 2013, 07:08:48 UTC | Instructed mac users to install XCode; also instruct how to install pip. | 29 July 2013, 07:33:36 UTC |
| feb7a7d | John McDonnell | 28 July 2013, 05:52:25 UTC | Regarding Issue #3, Added use_debriefing option to skip debriefing step | 28 July 2013, 05:52:25 UTC |
| 3734546 | John McDonnell | 28 July 2013, 05:39:40 UTC | Removed link to Jay's NYU files | 28 July 2013, 05:40:35 UTC |
| 4cfbb15 | John McDonnell | 27 July 2013, 23:07:57 UTC | Trying not to be too heavy-handed with the tagline | 28 July 2013, 05:39:53 UTC |
| 00aa19d | John McDonnell | 27 July 2013, 23:03:44 UTC | Removed atavistic code. | 28 July 2013, 05:39:53 UTC |
| 26e6142 | John McDonnell | 27 July 2013, 19:00:42 UTC | Fixed stylesheet for consent | 28 July 2013, 05:39:52 UTC |
| 103fa5a | John McDonnell | 27 July 2013, 18:51:35 UTC | Cleanup of templates, removed legacy code from experiment.py | 28 July 2013, 05:39:52 UTC |
| cb93ce5 | Todd Gureckis | 27 July 2013, 16:28:42 UTC | kicking the can down the road on the log panel | 27 July 2013, 16:28:42 UTC |
| 9acf956 | Jay B. Martin | 26 July 2013, 21:16:29 UTC | fixted test button not appearing bug and default pay tab bug | 26 July 2013, 21:16:29 UTC |
| 67b2a46 | Jay B. Martin | 26 July 2013, 00:49:33 UTC | initial release of accept/reject assignment feature. also, marks database as credited. | 26 July 2013, 00:49:33 UTC |
| d1a2498 | Jay B. Martin | 25 July 2013, 16:27:09 UTC | load scrollbars in log on overflow | 25 July 2013, 16:27:09 UTC |
| bfb4b6c | Jay B. Martin | 25 July 2013, 07:12:39 UTC | updated restart instructions | 25 July 2013, 07:12:39 UTC |
| 819b748 | Jay B. Martin | 25 July 2013, 07:12:16 UTC | sidebar now launches logger with required assets | 25 July 2013, 07:12:16 UTC |
| 26b5972 | Jay B. Martin | 25 July 2013, 07:10:43 UTC | console theme for logger view | 25 July 2013, 07:10:43 UTC |
| 89051fe | Jay B. Martin | 25 July 2013, 07:10:12 UTC | added yellow indicator lights for server on/off switch and some general refactoring | 25 July 2013, 07:10:12 UTC |
| 56e748e | Jay B. Martin | 25 July 2013, 07:09:04 UTC | fixed typos that were crashing the experiment server | 25 July 2013, 07:09:04 UTC |
| a4a9ab8 | Jay B. Martin | 25 July 2013, 01:56:27 UTC | Merge branch 'dev' of https://github.com/NYUCCL/psiTurk into logging * 'dev' of https://github.com/NYUCCL/psiTurk: After name changes, server no longer booted, fixed here. Fix for issue #32, Popen takes a flag to close file descriptors, which closes the port socket descriptor. Refactored image and page prefetching; folded showPage into PsiTurk object. Bumping up libraries to latest versions eliminating confusion of psiTurk versus Experiment server. | 25 July 2013, 01:56:27 UTC |
| 58efe0a | John McDonnell | 24 July 2013, 23:03:57 UTC | After name changes, server no longer booted, fixed here. | 24 July 2013, 23:03:57 UTC |
| 03c10bb | John McDonnell | 24 July 2013, 23:01:53 UTC | Fix for issue #32, Popen takes a flag to close file descriptors, which closes the port socket descriptor. | 24 July 2013, 23:01:53 UTC |
| 810f8e4 | Todd Gureckis | 24 July 2013, 01:43:38 UTC | first pass, enables the log sidebar item and loads a new template in that spot. otherwise non-functional | 24 July 2013, 01:43:38 UTC |
| c3208bd | John McDonnell | 23 July 2013, 23:23:24 UTC | Refactored image and page prefetching; folded showPage into PsiTurk object. | 23 July 2013, 23:45:24 UTC |
| 36064e1 | John McDonnell | 23 July 2013, 23:30:37 UTC | Bumping up libraries to latest versions | 23 July 2013, 23:45:23 UTC |
| 91c12ca | Todd Gureckis | 23 July 2013, 21:24:40 UTC | eliminating confusion of psiTurk versus Experiment server. Now the process that serves the experiment code is called the Experiment Server. The process that serves dashboard is called the Dashboard Server. I believe that experiment_server_controller.py and experiment_server.py could be combined. | 23 July 2013, 21:24:40 UTC |
| 61c12bc | Todd Gureckis | 23 July 2013, 18:50:27 UTC | refactor server control processes. i think this has all the functionality of previous set up by is more clear | 23 July 2013, 18:50:27 UTC |
| a0ea0f0 | Todd Gureckis | 23 July 2013, 18:02:55 UTC | more consistent filename in /psiturk | 23 July 2013, 18:02:55 UTC |
| 8371a0e | Todd Gureckis | 23 July 2013, 01:00:40 UTC | typo | 23 July 2013, 15:27:41 UTC |
| 0dfca99 | Todd Gureckis | 22 July 2013, 19:29:10 UTC | should ignore server.log in version tracking, is auto-created at runtime | 23 July 2013, 15:27:41 UTC |
| ca4d95f | John McDonnell | 23 July 2013, 15:22:28 UTC | Added example directories to the manifest | 23 July 2013, 15:22:28 UTC |
| ce341b8 | John McDonnell | 23 July 2013, 06:14:36 UTC | Quick fix to the zombie daemon bug | 23 July 2013, 06:14:36 UTC |
| 0781fe0 | John McDonnell | 23 July 2013, 05:02:46 UTC | Revert "Shut down dashboard more properly" This reverts commit 675ef8c914c5b41aaaf729f0f91767bebe9a3ca4. | 23 July 2013, 05:02:46 UTC |
| 8e30d50 | John McDonnell | 23 July 2013, 04:24:37 UTC | Stimuli now go in forwards rather than backwards order | 23 July 2013, 04:24:37 UTC |
| 675ef8c | John McDonnell | 23 July 2013, 04:19:38 UTC | Shut down dashboard more properly | 23 July 2013, 04:19:38 UTC |
| 5009067 | John McDonnell | 23 July 2013, 03:19:17 UTC | Applied stylesheet to consent form. | 23 July 2013, 03:23:02 UTC |
| 0bb2dcc | John McDonnell | 22 July 2013, 16:40:10 UTC | Added argparse dependency. | 23 July 2013, 03:23:01 UTC |
| ee98446 | John McDonnell | 22 July 2013, 21:03:24 UTC | Added header to event file. | 22 July 2013, 21:03:24 UTC |
| f11e393 | John McDonnell | 22 July 2013, 21:03:12 UTC | Not sure why server.log was committed | 22 July 2013, 21:03:12 UTC |
| a2febb4 | John McDonnell | 22 July 2013, 20:36:00 UTC | Two things: Added Initalizing db if necessary. Copying /home/mcdon/repos/psiTurk/psiturk/static_example to ./static Copying /home/mcdon/repos/psiTurk/psiturk/templates_example to ./templates script to populate a directory with the stroop task files, and moved all the dashboard coffeescript into src_dashboard | 22 July 2013, 20:36:00 UTC |
| 29d9bb6 | Jay B. Martin | 22 July 2013, 14:08:14 UTC | updated stroop install instructions | 22 July 2013, 15:20:07 UTC |
| 505b97a | Jay B. Martin | 22 July 2013, 10:30:12 UTC | tiny bug fix for expt indicatior | 22 July 2013, 15:20:07 UTC |
| 2fa27c7 | Jay B. Martin | 22 July 2013, 10:08:09 UTC | Temp fix for unique debug names | 22 July 2013, 15:20:07 UTC |
| 4ad8f57 | Jay B. Martin | 22 July 2013, 09:53:19 UTC | bug fix for network failure | 22 July 2013, 15:20:07 UTC |
| dfc5231 | Jay B. Martin | 22 July 2013, 02:47:36 UTC | refactored content loader | 22 July 2013, 15:20:07 UTC |
| 74da704 | Todd Gureckis | 22 July 2013, 15:06:05 UTC | using self.config.get() for floating point numbers was generating errors for me | 22 July 2013, 15:06:05 UTC |
| 07d587d | John McDonnell | 21 July 2013, 20:35:48 UTC | A few changes to the stylesheet. | 21 July 2013, 20:35:48 UTC |
| b37e78f | Jay B. Martin | 21 July 2013, 18:55:38 UTC | draft for hands on portion of the conference slides | 21 July 2013, 18:55:38 UTC |
| 33b2e2b | Jay B. Martin | 21 July 2013, 18:23:22 UTC | added debug params test button link; removed extraneous js files in source | 21 July 2013, 18:23:22 UTC |
| 311e193 | Jay B. Martin | 21 July 2013, 09:02:20 UTC | fixed typo that caused bug in database tab | 21 July 2013, 09:02:20 UTC |
| 7ec2a8b | Jay B. Martin | 21 July 2013, 08:55:41 UTC | fancier progress bars | 21 July 2013, 08:55:41 UTC |
| 7d2a0df | Jay B. Martin | 21 July 2013, 08:46:09 UTC | screen greys out on shutdown | 21 July 2013, 08:46:09 UTC |
| 3236918 | Jay B. Martin | 21 July 2013, 07:54:35 UTC | fixed save to config bug | 21 July 2013, 07:54:35 UTC |
| 0439619 | Jay B. Martin | 21 July 2013, 07:06:23 UTC | removed redundant hit config options | 21 July 2013, 07:06:23 UTC |
| 060e9fc | Jay B. Martin | 21 July 2013, 07:00:12 UTC | added sandbox & live tabs | 21 July 2013, 07:00:12 UTC |
| 9ef9ca2 | Jay B. Martin | 21 July 2013, 05:51:37 UTC | Added test button on overview bar | 21 July 2013, 05:51:37 UTC |
| 3820860 | John McDonnell | 20 July 2013, 22:55:40 UTC | Got rid of the last traces of gevent. | 20 July 2013, 22:55:40 UTC |
| ff82137 | John McDonnell | 20 July 2013, 22:52:35 UTC | Starting and shutting down both servers now seems to work reliably. | 20 July 2013, 22:52:35 UTC |
| 809996e | John McDonnell | 20 July 2013, 22:47:14 UTC | Switched to using a cakefile for coffeescript. Coffescript will live in src_dashboard in the root directory. Running `cake watch` in the root directory will compile then watch for changes. | 20 July 2013, 22:47:14 UTC |
| 036828a | John McDonnell | 20 July 2013, 18:57:53 UTC | Removed redundant server monitoring code. | 20 July 2013, 18:57:53 UTC |
| a87962e | John McDonnell | 20 July 2013, 18:45:57 UTC | Poll interval typo fixed. | 20 July 2013, 18:45:57 UTC |
