Commit Graph

3274 Commits

Author SHA1 Message Date
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
bjoluc
6d8aca9881 Update docs dependencies 2023-09-12 17:34:17 +02:00
bjoluc
2f37c57d22
Refactor free-sort plugin to use pointer events (#2893) 2023-09-12 17:33:19 +02:00
bjoluc
cb87df4c10
Upload dist archive for all releases (#3125) 2023-09-12 17:31:15 +02:00
Josh de Leeuw
8f0075b8a1
Merge pull request #3074 from jspsych/changeset-release/main
Version Packages
2023-06-22 12:29:45 -04:00
github-actions[bot]
4f1fda898e chore(release): version packages 2023-06-22 16:21:55 +00:00
Josh de Leeuw
be0645e49a fix package-lock.json 2023-06-22 12:18:00 -04:00
Josh de Leeuw
e85d0f4d26
Merge pull request #3073 from jspsych/config-bump-canvas
Update canvas version in config
2023-06-22 12:00:29 -04:00
Josh de Leeuw
caef8713e2 update canvas version 2023-06-22 11:46:33 -04:00
Josh de Leeuw
a7e6f8c40f
Merge pull request #3041 from jspsych/changeset-release/main
Version Packages
2023-05-17 16:02:58 -04:00
github-actions[bot]
be2f69382c chore(release): version packages 2023-05-17 20:01:29 +00:00
Josh de Leeuw
61094d7d12
Merge pull request #3039 from jspsych/simulation-mode-fixes
Fixes for simulation mode
2023-05-17 15:56:33 -04:00
Josh de Leeuw
545ecbaa76 update test case 2023-05-17 15:42:39 -04: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
347bbb557c fix #2462 2023-05-17 13:11:49 -04:00
Josh de Leeuw
612d9e125f add changeset 2023-05-17 12:12:40 -04:00
Josh de Leeuw
c5d3925a17 fix #2859 2023-05-17 12:11:04 -04:00
Josh de Leeuw
7dd439fdcc fix test case, need to pressKey because not simulation 2023-05-17 12:10:43 -04:00
Josh de Leeuw
e0026a3f87 add failing test for #2859 2023-05-17 11:38:05 -04:00
Josh de Leeuw
952cdf5b12 Fixed pre_target_duration parameter 2023-05-17 11:25:57 -04:00
Josh de Leeuw
852d574516 add changeset 2023-05-17 11:13:20 -04:00
Josh de Leeuw
1032c71eef fix #2862 2023-05-17 11:11:56 -04:00
Josh de Leeuw
5f2b049763 add failing test for #2862 2023-05-17 10:47:54 -04:00
Josh de Leeuw
b6d4b18278 add test case for #2912 2023-05-17 10:30:56 -04:00
Josh de Leeuw
465527a849 add changeset 2023-05-16 21:37:57 -04:00
Josh de Leeuw
a5e5a21cab fix #2911 2023-05-16 21:35:58 -04:00
Josh de Leeuw
236cac8a21 add deepMerge utility function 2023-05-16 21:35:20 -04:00
Josh de Leeuw
d0a6839ac2 add a test for #2911 2023-05-16 17:45:23 -04:00
Josh de Leeuw
481efec075 add changeset 2023-05-16 12:28:30 -04:00
Josh de Leeuw
464b0d2387 fix #3008 2023-05-16 12:27:14 -04:00
Josh de Leeuw
831fe2e39f merge 2023-05-16 12:24:51 -04:00
Josh de Leeuw
a72a455fb4 add test case for #3008 2023-05-16 12:22:25 -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
61013f2867
Merge pull request #3033 from jspsych/paper-citation-update
Update citation guidelines for JOSS paper
2023-05-11 09:58:33 -04:00
Josh de Leeuw
4bf8f6f75c update citations across all readme 2023-05-11 09:44:23 -04:00
Josh de Leeuw
aec3bd0fd5 change citation language 2023-05-10 09:30:49 -04:00
Josh de Leeuw
def9a6da4b placeholder for JOSS citation 2023-05-08 14:47:48 -04:00
Josh de Leeuw
74f950b751 update years in readme 2023-04-01 20:56:29 -04:00
bjoluc
5af76ab4d7
Merge pull request #2981 from jspsych/dependabot/npm_and_yarn/webpack-5.76.0
Bump webpack from 5.72.1 to 5.76.0
2023-03-20 20:19:48 +01:00
dependabot[bot]
9ec358623b
Bump webpack from 5.72.1 to 5.76.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.72.1 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.72.1...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-15 01:18:09 +00: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
Josh de Leeuw
5dca685a9d
Merge pull request #2961 from qbunt/patch-1
Fix for broken link on hello-world
2023-03-06 10:40:44 -05:00
Josh de Leeuw
268c037673
Delete dull-forks-talk.md
changeset not necessary for documentation update
2023-03-06 10:40:29 -05:00
Josh de Leeuw
a284ed3e1d
Merge pull request #2974 from jspsych/fix-complex-defaults
Fix defaults for COMPLEX parameter types
2023-03-06 10:39:20 -05:00
Josh de Leeuw
abea84781a
Merge pull request #2930 from jspsych/dependabot/npm_and_yarn/json5-2.2.3
Bump json5 from 2.2.1 to 2.2.3
2023-03-06 10:12:17 -05:00
Josh de Leeuw
1324361835 Fix defaults for COMPLEX parameter types 2023-03-06 10:09:24 -05:00
Jeremy Bunting
4e60dfd8f8
Create dull-forks-talk.md 2023-02-23 15:28:09 -05:00
Jeremy Bunting
fb97ec1673
Fix for broken link on hello-world 2023-02-23 15:16:21 -05:00