Commit Graph

3681 Commits

Author SHA1 Message Date
Josh de Leeuw
48c68d686f DO NOT force this seems bad.
(rebased-with-history from commit f38673c6b8)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
c856e7e504 fix checkout and push
(rebased-with-history from commit 2faff02b1f)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
9218abf9fc config git
(rebased-with-history from commit 38682d86c8)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
599d4a2e87 get major.minor version another way
(rebased-with-history from commit 841d43250c)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
e34a91e8fe try simplifying
(rebased-with-history from commit a13601c3c1)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
a7041bb230 change name
(rebased-with-history from commit fd1c5506bf)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
1f15f934de repair quotes
(rebased-with-history from commit cca2fc445d)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
6160777435 fix extra quotes?
(rebased-with-history from commit 58e3df5af8)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
8bfbef2708 try using env.versions
(rebased-with-history from commit 9237de363a)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
6fa906f386 try using the environment variable
(rebased-with-history from commit 09ce038f26)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
a23a3d5c6f don't try to install the root project with poetry
(rebased-with-history from commit ab31ef6386)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
3f9bfcd5a3 fix missing " mark
(rebased-with-history from commit b47f142270)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
43c87cfe4c fix poetry install; remove npm ci
(rebased-with-history from commit e635411c70)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
89f1c9382c Merge pull request #3215 from jspsych/add-docs-publish-action
add publish-docs action

(rebased-with-history from commit c1ddf929e1)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
8308f95ec4 Merge pull request #3214 from jspsych/changeset-release/main
Version Packages

(rebased-with-history from commit 8e56e57df7)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
d431e03c4b Merge pull request #3213 from jspsych/add-response-ends-trial-vs-circle
Fix display clearing bug in visual search circle plugin version 1.2.0

(rebased-with-history from commit daea41bd16)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
79262362d7 Merge pull request #3212 from jspsych/changeset-release/main
Version Packages

(rebased-with-history from commit e278bff353)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
d7f4912eea Merge pull request #3211 from jspsych/add-response-ends-trial-vs-circle
Add `response_ends_trial` for visual search circle plugin

(rebased-with-history from commit c64d3fe9b0)
2024-06-07 22:49:07 +02:00
bjoluc
4eba29d00d Merge pull request #3178 from jspsych/docs-update-setup-instructions
Update dev environment configuration docs

(rebased-with-history from commit d33176a5f3)
2024-06-07 22:49:07 +02:00
bjoluc
9042e8553f Merge pull request #3126 from jspsych/changeset-release/main
Version Packages

(rebased-with-history from commit e94e6a79f0)
2024-06-07 22:49:07 +02:00
bjoluc
084292f6cb Merge pull request #3184 from jspsych/fix-sourcemap-urls
Point to source maps via canonical unpkg URLs in CI browser builds

(rebased-with-history from commit b8a85c7202)
2024-06-07 22:49:07 +02:00
bjoluc
c31b859533 Merge pull request #3122 from jspsych/update-config-package
Update `@jspsych/config` dependencies

(rebased-with-history from commit 76fca2712f)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
5ce28b34ed Merge pull request #3150 from ayugioh2003/main
fix broken "eye-tracking-with-webgazer" demo page 

(rebased-with-history from commit cd53e7e93b)
2024-06-07 22:49:07 +02:00
Nikolay Petrov
30b5587973 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>

(rebased-with-history from commit b78dcc6830)
2024-06-07 22:49:07 +02:00
bjoluc
5f4c073f1d Update docs dependencies
(rebased-with-history from commit 6d8aca9881)
2024-06-07 22:49:07 +02:00
bjoluc
3a2c717746 Refactor free-sort plugin to use pointer events (#2893)
(rebased-with-history from commit 2f37c57d22)
2024-06-07 22:49:07 +02:00
bjoluc
ddd6cde2eb Upload dist archive for all releases (#3125)
(rebased-with-history from commit cb87df4c10)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
fa24fa8062 Merge pull request #3074 from jspsych/changeset-release/main
Version Packages

(rebased-with-history from commit 8f0075b8a1)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
8604ac50cb fix package-lock.json
(rebased-with-history from commit be0645e49a)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
ee595c3dfc Merge pull request #3073 from jspsych/config-bump-canvas
Update canvas version in config

(rebased-with-history from commit e85d0f4d26)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
c6a5691c06 update action version logic 2024-06-06 21:47:50 -04:00
Josh de Leeuw
7ddac35c43 use poetry 1.8.0 for non-package mode support 2024-06-06 21:41:06 -04:00
Josh de Leeuw
f255f99707 put poetry in non package mode 2024-06-06 21:38:31 -04:00
Josh de Leeuw
a83590a85d fix broken links, add camera recorder docs 2024-06-06 21:34:20 -04:00
Josh de Leeuw
505be4bd6c
Merge pull request #3304 from jspsych/v8-null-default-test
Add a test case for trial parameters with `null` values
2024-06-06 19:08:12 -04:00
Josh de Leeuw
3908e517fc
Merge pull request #3310 from jspsych/docs-major-release-versioning
Use major release version only for documentation
2024-06-06 18:34:21 -04:00
Josh de Leeuw
46d0c9b050 use v7 instead of 7.x 2024-06-06 18:28:09 -04:00
Josh de Leeuw
a85fba0923 edit mkdocs config 2024-06-06 16:49:15 -04:00
Josh de Leeuw
126f87becb update github action to deploy only major version info 2024-06-06 09:41:31 -04:00
Josh de Leeuw
474c1e1f78
Update link URL in about.md 2024-06-05 08:51:27 -04:00
Josh de Leeuw
4a649c311b
Change URL in readme 2024-06-05 08:50:42 -04:00
Josh de Leeuw
5837568c2b ensure that null values are allowed, even when there is a default 2024-06-03 13:51:23 -04:00
Josh de Leeuw
dc6de01a95 add changeset for canvas block fixes 2024-06-03 11:50:22 -04:00
Josh de Leeuw
dc83096722 add block display to fix #3056 2024-06-03 11:48:56 -04:00
Josh de Leeuw
84dca432d2 update to canvas v2.11.2 2024-06-03 11:48:21 -04:00
Josh de Leeuw
10bdbd6a8f Merge branch 'v8' into v8-css-updates 2024-06-03 10:34:07 -04:00
Josh de Leeuw
7d41078e9d
Merge pull request #3300 from jspsych/changeset-release/main
Version Packages
2024-05-20 12:49:35 -04:00
github-actions[bot]
e44dca7cf3 chore(release): version packages 2024-05-20 16:45:37 +00:00
Josh de Leeuw
87d2a8e0ab
Merge pull request #3298 from thtTNT/main
Add parameter "enable_button_after" to all "-button-response" plugins
2024-05-20 12:41:50 -04:00
Haotian Tu
a4088529cf Add parameter "enable_button_after" to all "-button-response" plugins (#3289) 2024-05-20 23:07:14 +08:00