HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 11:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,275 Commits 14 Branches 506 Tags 58 MiB
cc3b1a1230
Commit Graph

977 Commits

Author SHA1 Message Date
John Chiu
cc3b1a1230
Update eye-tracking-with-webgazer.html 
page demos/eye-tracking-with-webgazer broken
Uncaught ReferenceError: jsPsychHtmKeyboardResponse is not defined

refs:
- https://www.jspsych.org/7.0/demos/eye-tracking-with-webgazer.html
- https://www.jspsych.org/7.3/overview/eye-tracking/#example
 2023-10-13 02:44:08 +08:00
Nikolay Petrov
b78dcc6830
Making it clear when on_trial_start and on_trial_finish are executed. (#3118) 
* Making it clear when on_trial_start and on_trial_finish are executed.

* Update docs/overview/events.md

Co-authored-by: bjoluc <mail@bjoluc.de>

* Update docs/overview/events.md

Co-authored-by: bjoluc <mail@bjoluc.de>

---------

Co-authored-by: bjoluc <mail@bjoluc.de>
 2023-09-15 11:42:35 +02:00
github-actions[bot]
be2f69382c chore(release): version packages 2023-05-17 20:01:29 +00:00
Josh de Leeuw
09ee347fa5 Add RT property to fullscreen data collection. Support setting this property in simulation mode. #2462 2023-05-17 14:00:04 -04:00
Josh de Leeuw
ba66284e80 Merge branch 'main' of https://github.com/jspsych/jsPsych 2023-05-11 10:08:18 -04:00
Josh de Leeuw
a26a3c7cec add trial duration to example code 2023-05-11 10:08:11 -04:00
Josh de Leeuw
4bf8f6f75c update citations across all readme 2023-05-11 09:44:23 -04:00
Josh de Leeuw
def9a6da4b placeholder for JOSS citation 2023-05-08 14:47:48 -04:00
Josh de Leeuw
e409b03d64
Merge pull request #2975 from jspsych/changeset-release/main 
Version Packages
 2023-03-06 10:59:56 -05:00
github-actions[bot]
9a89940c73 chore(release): version packages 2023-03-06 15:42:53 +00:00
Jeremy Bunting
fb97ec1673
Fix for broken link on hello-world 2023-02-23 15:16:21 -05:00
emengd
55a50966d2
Fix typo in documentation 
I was very confused by the documentation of `getCurrentTimelineNodeID` until I realized there is a typo.
 2023-02-01 18:14:50 +01:00
Josh de Leeuw
3704a528b8
Merge pull request #2946 from jadeddelta/sketchpad-doc-update 
sketchpad documentation fixes
 2023-01-24 09:06:46 -05:00
jadeddelta
5be8bce5dd fix ambiguity in save_final_image + style update 2023-01-23 22:06:14 -05:00
bjoluc
4533e3d012 Fix webgazer CDN URLs 2022-11-24 21:37:05 +01:00
Dillon Plunkett
c8213c8d1b
fix a typo in image-keyboard-response description (#2876) 2022-11-21 18:19:58 +01:00
Josh de Leeuw
1b14e05995 Fix button_label_back in survey plugin documentation 2022-11-01 15:02:51 -04:00
Zhaobin Li
bba13d3c99 fixed browser-check typo in doc demos 2022-10-18 12:08:37 -04:00
Zhaobin Li
c75c80b7e7 fixed browser-check typo in doc example 2022-10-18 11:24:51 -04:00
github-actions[bot]
0f5181adb6 chore(release): version packages 2022-10-12 14:35:29 +00:00
Becky Gilbert
2a081607bf add section on updating live site, add npm docs commands, fix typos 2022-10-07 16:53:35 -07:00
Becky Gilbert
399b4e0516 fix formatting for last example 2022-10-07 16:27:40 -07:00
Becky Gilbert
540046b108 edit info admonitions: add titles, make collapsible, fix links, formatting and typos 2022-10-07 14:42:34 -07:00
Becky Gilbert
cbd487f2a5 clarify wording of cloze plugin mistake_fn description 2022-10-07 13:50:37 -07:00
Becky Gilbert
784cb4997c fix typo 2022-10-07 13:31:37 -07:00
Becky Gilbert
f582dc914c fix info box formatting (compare keys), add info box (timeline reps and randomizing) - fixes #2783 2022-10-07 13:10:35 -07:00
Becky Gilbert
10930af331 Merge branch 'main' of https://github.com/jspsych/jsPsych 2022-10-06 16:37:05 -07:00
Becky Gilbert
468545c281 add survey demo showing how to add trial data - fixes #2548 2022-10-06 16:32:08 -07:00
Becky Gilbert
fc78351ac1 add note about compareKeys - fixes #2400 2022-10-06 15:16:21 -07:00
github-actions[bot]
5d1cb0310d chore(release): version packages 2022-10-05 17:59:11 +00:00
Josh de Leeuw
52827bd552
Merge pull request #2784 from jadeddelta/cloze-checkblank 
Cloze `allow_blanks` functionality
 2022-10-01 14:17:21 -04:00
Becky Gilbert
f3c2895bde fix broken link to survey demo 2 - fixes #2495 2022-09-29 16:39:39 -07:00
Becky Gilbert
60fb5b73f6 minor docs edits 2022-09-29 16:23:02 -07:00
Becky Gilbert
d7aba607fb
Merge pull request #2787 from jadeddelta/docu-fix-and-update 
Fix broken demos, fix contributions link in CoC, fix docs grammar/style and subject -> participant
 2022-09-29 16:13:46 -07:00
Becky Gilbert
791ff4e694
Merge pull request #2728 from pablobernabeu/patch-6 
Specified trials 'with a correct response' in one of the data filtering documentation examples in data.md.
 2022-09-29 13:15:23 -07:00
jadeddelta
6914571438 Merge branch 'main' into docu-fix-and-update 2022-09-23 22:09:00 -04:00
jadeddelta
97e1dc72b9 grammar + shift from subject to participant 2022-09-23 22:00:39 -04:00
jadeddelta
d65d91fe81 align readme with docs 2022-09-23 15:56:12 -04:00
jade
9eb7d272a6
Merge branch 'jspsych:main' into cloze-checkblank 2022-09-23 15:53:51 -04:00
jadeddelta
68c3490f91 change from check_blanks to allow_blanks 2022-09-23 15:51:39 -04:00
jadeddelta
8c77b43a7c added documentation info 2022-09-22 14:00:22 -04:00
jadeddelta
d13d1611cb bugfixes for doc demos 2022-09-22 11:57:33 -04:00
github-actions[bot]
c2cc94db81 chore(release): version packages 2022-09-20 16:56:51 +00:00
Pablo Bernabeu
a8d423797e
Update data.md 2022-07-22 17:18:57 +01:00
Pablo Bernabeu
a3f14588f0
Specification in data.md 
Added 'correct' before 'number of correct trials in a data collection'
 2022-07-22 17:09:10 +01:00
Josh de Leeuw
e5447cee27 fix docs version 2022-07-20 12:56:43 -04:00
github-actions[bot]
e715546aa1 chore(release): version packages 2022-07-20 13:24:31 +00:00
Josh de Leeuw
d15cf796ea put reference in admonition 2022-07-19 19:52:23 -04:00
Josh de Leeuw
f3235a1629
Merge pull request #2693 from nikbpetrov/patch-3 
Adding a reference to the published paper
 2022-07-19 19:44:39 -04:00
Josh de Leeuw
bac71fcf72
Merge pull request #2649 from jspsych/video-recording 
Video Recording Features
 2022-07-19 19:43:43 -04:00