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,343 Commits 14 Branches 506 Tags 58 MiB
f255f99707
Commit Graph

3343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dillon Plunkett
c8213c8d1b
fix a typo in image-keyboard-response description (#2876) 2022-11-21 18:19:58 +01:00
bjoluc
b05a45b591
Merge pull request #2857 from jspsych/dependabot/npm_and_yarn/loader-utils-2.0.3 
Bump loader-utils from 2.0.2 to 2.0.3
 2022-11-09 11:20:36 +01:00
dependabot[bot]
27a175d4e0
Bump loader-utils from 2.0.2 to 2.0.3 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.3/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.2...v2.0.3)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-09 02:07:34 +00:00
Josh de Leeuw
1b14e05995 Fix button_label_back in survey plugin documentation 2022-11-01 15:02:51 -04:00
Josh de Leeuw
281c8e6c69
Merge pull request #2826 from ZhaoBin-Li/main 
fixed browser-check typo in doc example
 2022-10-18 16:06:00 -04:00
ZhaoBin Li
08ff122a5e
Merge pull request #1 from ZhaoBin-Li/browser-check 
fixed browser-check typo in doc demos
 2022-10-18 12:12:28 -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
Josh de Leeuw
7e62982fb8
Merge pull request #2812 from jspsych/changeset-release/main 
Version Packages
 2022-10-12 10:40:46 -04:00
github-actions[bot]
0f5181adb6 chore(release): version packages 2022-10-12 14:35:29 +00:00
Josh de Leeuw
dd8f3be5d9
Merge pull request #2754 from javidalpe/main 
Fix preload plugin onerror callback
 2022-10-12 10:32:25 -04:00
Josh de Leeuw
6bf9ea973e
Create bright-tables-provide.md 2022-10-11 22:10:04 -04:00
Josh de Leeuw
669568d344
Merge pull request #2811 from jspsych/fix-shuffleNoRepeats 
Fixes `shuffleNoRepeats` when the equality test contains a logical OR
 2022-10-11 18:44:17 -04:00
Josh de Leeuw
28136787ec add changeset 2022-10-11 18:13:08 -04:00
Josh de Leeuw
a3523ad2a5 fixes #2810 2022-10-11 18:07:24 -04:00
bjoluc
a45941ad95 Rename randomziation.test.ts => randomization.test.ts 
On second thought, I like randomziation. It sounds much more random!
 2022-10-11 15:11:17 +02:00
bjoluc
c9326e32bf Add test case for #2808 2022-10-11 14:59:35 +02: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