89 Commits

Author	SHA1	Message	Date
Josh de Leeuw	f0cd0aae9c	fix missing link	2021-04-09 12:45:55 -04:00
Josh de Leeuw	cec803c7fa	Merge branch 'master' into feature-eye-tracking-improvements	2021-04-09 12:16:23 -04:00
Josh de Leeuw	8aaceab759	update docs	2021-04-09 12:04:05 -04:00
Becky Gilbert	163f3479b0	fix docs formatting issues, edit code blocks for consistency	2021-03-24 15:07:28 -07:00
Josh de Leeuw	bf9dec250b	Merge branch 'master' of https://github.com/jspsych/jsPsych	2021-03-01 13:25:57 -05:00
Josh de Leeuw	2a4a1fafa0	fix docs formatting for callbacks page	2021-03-01 13:25:54 -05:00
Josh de Leeuw	bbd50935d3	add note about permission to overview	2021-03-01 10:24:09 -05:00
Becky Gilbert	4a59c863aa	fix more webgazer links in docs #1562	2021-02-24 12:45:30 -08:00
Becky Gilbert	7e8b83825d	fix link	2021-02-21 15:05:37 -08:00
Becky Gilbert	65b6de4b82	edit code comments	2021-02-21 14:45:33 -08:00
Becky Gilbert	723952879c	edit admonition	2021-02-21 14:45:19 -08:00
Becky Gilbert	0b776ab3f8	remove preloading from experiment options docs	2021-02-21 14:37:19 -08:00
Becky Gilbert	bb10f7feb0	edit text, fix note formatting	2021-02-21 14:34:51 -08:00
Becky Gilbert	25d08f4579	fix heading level	2021-02-21 14:33:58 -08:00
Becky Gilbert	5236b6470a	add missing links, fix markdown errors	2021-02-21 14:25:11 -08:00
Becky Gilbert	19fc9e35c9	minor edit to text	2021-02-21 13:51:45 -08:00
Becky Gilbert	5b0dcfd801	Merge pull request #1401 from pablobernabeu/patch-4 ... Update style.md	2021-02-21 13:37:17 -08:00
Becky Gilbert	8a3c6fa7ea	add save_trial_parameters to docs, add sections/examples for save_trial_parameters and css_classes #823	2021-02-20 15:43:25 -08:00
Becky Gilbert	2c28278ad5	change direct key comparisons to use jsPsych.pluginAPI.compareKeys to allow for case sensitive or insensitive comparison #396	2021-02-18 12:52:10 -08:00
Becky Gilbert	4fbfe94e4c	change key_press to response in docs and examples	2021-02-17 16:24:27 -08:00
Becky Gilbert	8a9e1a655a	change responses to response in survey-text plugin #638	2021-02-17 15:58:54 -08:00
Becky Gilbert	2312550127	Merge branch 'master' into feature-objects-arrays-in-data	2021-02-16 14:37:07 -08:00
Josh de Leeuw	d0a9a7c6c1	update webgazer image example	2021-02-16 09:34:33 -05:00
Josh de Leeuw	e5a8a77ef3	Merge branch 'master' into feature-plugin-extensions	2021-02-15 21:44:45 -05:00
Becky Gilbert	5ea70030be	remove unnecessary JSON.parse	2021-02-12 16:28:57 -08:00
Becky Gilbert	9442b0cbcc	edit docs to clarify when on_timeline_start/finish run relative to conditional/loop functions	2021-02-12 11:14:57 -08:00
Becky Gilbert	080b2955da	Merge branch 'master' into feature-timeline-events	2021-02-12 10:58:01 -08:00
Becky Gilbert	8c85707107	tweak docs and examples for on_timeline_start and on_timeline_finish	2021-02-12 10:53:05 -08:00
Becky Gilbert	f84539309a	add case_sensitive jsPsych.init parameter to experiment-options docs page	2021-02-12 10:15:58 -08:00
Becky Gilbert	446ebe5870	change last heading text in dynamic params docs	2021-02-12 09:49:26 -08:00
Josh de Leeuw	a5fc7af7e8	minor edits to preload docs	2021-02-12 11:45:45 -05:00
Josh de Leeuw	969484f0e6	Merge branch 'master' into preload-docs	2021-02-12 11:28:47 -05:00
Josh de Leeuw	2f7e5cce62	some minor docs edits	2021-02-12 11:00:45 -05:00
Becky Gilbert	d9648d3dcd	fix broken links in docs	2021-02-11 18:20:25 -08:00
Becky Gilbert	f833a4a794	add dynamic-params page, rename trials page as plugins, add content from plugins/overview and creating-a-plugin and remove those pages from plugins section	2021-02-11 18:06:26 -08:00
Becky Gilbert	b112ec4d6f	move repetitions parameter out of timeline_vars subheading	2021-02-11 15:47:52 -08:00
Becky Gilbert	fea41a71f6	remove references to preloading via jsPsych.init in experiment options docs page	2021-02-11 12:03:08 -08:00
Becky Gilbert	8238d9a9e3	update docs with preload plugin changes	2021-02-11 12:01:56 -08:00
Becky Gilbert	e67c75c092	update docs for preload plugin	2021-02-11 12:00:10 -08:00
Josh de Leeuw	dea4b13354	added prolific intergration guide to docs	2021-02-10 12:38:40 -05:00
Becky Gilbert	c51d30485a	add minor comment to example in docs	2021-02-09 17:35:52 -08:00
Becky Gilbert	92eb7d90dc	add note about protected functions	2021-02-09 17:30:31 -08:00
Becky Gilbert	45f5331156	add docs for nested function parameters	2021-02-09 17:17:33 -08:00
Becky Gilbert	daa37b7cfd	correction to docs on on_timeline_start	2021-02-09 13:58:17 -08:00
Becky Gilbert	10aa0f64e2	add docs for on_timeline_start and on_timeline_finish	2021-02-09 12:47:16 -08:00
Josh de Leeuw	bb0b84d86a	add samples_per_sec to validation plugin	2021-02-08 23:00:19 -05:00
Josh de Leeuw	ac5755e1dd	add note about computational resources	2021-02-08 22:36:31 -05:00
Josh de Leeuw	9bfeaff84a	Merge pull request #1413 from pablobernabeu/patch-5 ... Fixed typo in media-preloading.md	2021-02-08 22:16:12 -05:00
Josh de Leeuw	b10c69eb21	Merge branch 'master' into feature-key-code-update	2021-02-08 22:00:09 -05:00
Becky Gilbert	e78c4573eb	add extensions to experiment options docs	2021-02-05 17:47:07 -08:00