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 |
|
Josh de Leeuw
|
fd3a3e5562
|
Merge pull request #2951 from emengd/patch-1
Fix typo in documentation
|
2023-02-01 12:33:02 -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 |
|
dependabot[bot]
|
1c459cd097
|
Bump json5 from 2.2.1 to 2.2.3
Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.3)
---
updated-dependencies:
- dependency-name: json5
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-01-08 18:22:33 +00:00 |
|
bjoluc
|
4533e3d012
|
Fix webgazer CDN URLs
|
2022-11-24 21:37:05 +01:00 |
|
bjoluc
|
0b55a324f2
|
Fix duplicate on_load invocations in simulation mode
|
2022-11-24 20:50:58 +01:00 |
|
bjoluc
|
bbdf158564
|
Fix a typo in a test comment
|
2022-11-24 17:05:48 +01:00 |
|
Dillon Plunkett
|
c8213c8d1b
|
fix a typo in image-keyboard-response description (#2876)
|
2022-11-21 18:19:58 +01:00 |
|
bjoluc
|
ab8dbb156d
|
Make getNaiveTrialCount() sample-aware
|
2022-11-21 13:11:41 +01:00 |
|
bjoluc
|
931a54b57a
|
Misc refactoring in JsPsych.ts
|
2022-11-21 12:33:39 +01:00 |
|
bjoluc
|
6d0689decb
|
Replace @rollup/plugin-json with esbuild's json loader
|
2022-11-21 09:30:02 +01:00 |
|
bjoluc
|
1375339f63
|
Let TypeScript resolve JSON files in jspsych package
|
2022-11-21 09:25:51 +01:00 |
|
bjoluc
|
7ab1734ac6
|
Update changeset
|
2022-11-21 08:37:20 +01:00 |
|
bjoluc
|
2af76a0218
|
Remove babel.cjs from @jspsych/config
|
2022-11-20 19:46:39 +01:00 |
|
bjoluc
|
48a5a315fd
|
Replace the lodash-based parameter cache with a custom caching class
|
2022-11-20 19:43:55 +01:00 |
|
bjoluc
|
0a327b6179
|
Update remaining @jspsych/config dependencies
|
2022-11-19 11:27:02 +01:00 |
|
bjoluc
|
1b4f8de488
|
Update TypeScript to v4.9.3
|
2022-11-18 23:13:51 +01:00 |
|
bjoluc
|
2e40d013d4
|
Drop support for npm v7 and node up to v16
|
2022-11-18 23:08:46 +01:00 |
|
bjoluc
|
810ed7a3d1
|
Migrate to esbuild
|
2022-11-18 21:56:30 +01:00 |
|
bjoluc
|
76e7508024
|
Upgrade Jest to v29 and replace ts-jest with @sucrase/jest-plugin
|
2022-11-17 21:28:44 +01:00 |
|
bjoluc
|
0bc6f5486b
|
Add github-actions jest reporter to build workflow
|
2022-11-16 10:57:02 +01:00 |
|
bjoluc
|
bea5138b90
|
Fix webgazer plugin dependencies
|
2022-11-16 10:32:51 +01:00 |
|
bjoluc
|
b36a3f6372
|
Update root dependencies
|
2022-11-16 10:28:04 +01:00 |
|
bjoluc
|
68303a9c62
|
Fix type errors in webgazer plugins
|
2022-11-15 20:15:35 +01:00 |
|