118 Commits

Author	SHA1	Message	Date
Becky Gilbert	301b4cb788	tweak plugin parameter descriptions	2021-02-11 14:22:01 -08:00
Becky Gilbert	3694d756f0	initial commit for preload plugin docs	2021-02-11 13:53:22 -08:00
Becky Gilbert	b5211be302	tweak plugin descriptions to reflect switch to preload plugin	2021-02-11 12:12:19 -08:00
Josh de Leeuw	b10c69eb21	Merge branch 'master' into feature-key-code-update	2021-02-08 22:00:09 -05:00
Becky Gilbert	bc585ee64a	fix minor errors in plugin/parameter descriptions	2021-02-02 15:02:26 -08:00
Becky Gilbert	bc14216254	change all numeric key codes to key strings in docs #396	2021-02-02 12:25:11 -08:00
Becky Gilbert	662b6c0d2e	fix duration param typo	2021-02-01 18:08:44 -08:00
Becky Gilbert	fd097e996d	switch from keyCodes to key strings, fix param description errors and typos	2021-02-01 17:48:52 -08:00
Becky Gilbert	761491ed94	tweak example HTML file classes and add note about inheritance #832	2021-01-12 14:07:24 -08:00
Becky Gilbert	29d5aaa1c4	add css_classes to plugin overview docs, add example HTML file #832	2021-01-11 17:34:08 -08:00
Becky Gilbert	6aa5641bb5	improve description, fix missing param and incorrect default	2020-12-08 12:46:47 -08:00
Becky Gilbert	444b54e13f	fix missing/incorrect defaults, mention response allowed while playing param	2020-12-08 12:32:27 -08:00
Becky Gilbert	c55c2b3592	add link to params available in all plugins	2020-12-08 12:21:54 -08:00
Becky Gilbert	a4e809dac4	fix incorrect plugin order and typo	2020-12-08 11:25:09 -08:00
Becky Gilbert	8c50d15a21	update example labels	2020-12-08 11:22:01 -08:00
Becky Gilbert	63fc69c029	Merge branch 'master' of https://github.com/jspsych/jsPsych	2020-12-03 15:38:48 -08:00
Becky Gilbert	c3dd525bb7	tweak description	2020-12-03 15:32:21 -08:00
Becky Gilbert	e9bf43b29f	add new canvas and maxdiff plugins	2020-12-03 15:32:00 -08:00
Becky Gilbert	de9149c158	Merge pull request #1261 from jspsych/video-plugin-testing ... video-* plugins: stim parameter name change and tests	2020-12-03 14:21:18 -08:00
Josh de Leeuw	136cc5103c	fix #1265	2020-12-03 14:04:37 -05:00
Becky Gilbert	d9437c1c11	change sources parameter name to stimulus	2020-12-01 16:56:12 -08:00
Becky Gilbert	528a56c53e	Merge branch 'master' into docs-6.2	2020-11-25 11:51:23 -08:00
Becky Gilbert	32cdeae645	Merge branch 'master' into fix-consecutive-images	2020-11-25 10:50:26 -08:00
Becky Gilbert	bbef9ef9d2	Merge pull request #1203 from jspsych/freesort ... Updates to free-sort plugin	2020-11-25 09:48:05 -08:00
Becky Gilbert	347005809a	minor tweaks to wording	2020-11-20 15:51:18 -08:00
Becky Gilbert	1aaee22324	Merge pull request #1136 from awhug/master ... Add maxdiff plugin	2020-11-20 15:09:39 -08:00
Becky Gilbert	8cc2454cfd	add counter text and stim_starts_inside parameters	2020-11-19 18:22:08 -08:00
Becky Gilbert	4c0dab0122	add new border/background color parameters	2020-11-19 16:07:35 -08:00
Becky Gilbert	b1b3e7d973	remove dependency text	2020-11-19 15:43:37 -08:00
Becky Gilbert	7782eb2e3a	minor tweaks to wording, remove jQuery dependency	2020-11-19 14:54:19 -08:00
Becky Gilbert	175eaab10d	Merge pull request #1018 from kohler-visual-neuroscience-lab/master ... updates to free-sort plugin, new functionality	2020-11-18 17:46:02 -08:00
Becky Gilbert	386e5be719	minor changes for clarity and consistency with other plugins, more examples	2020-11-10 14:05:46 -08:00
Becky Gilbert	ece6e3b57e	Merge pull request #700 from cjungerius/feature/canvas ... Add canvas keyboard/button/slider plugins	2020-11-09 15:38:50 -08:00
Becky Gilbert	af8d531259	add render_on_canvas option, fix maintain_aspect_ratio - fixes #891 #969 #1172	2020-11-06 17:55:06 -08:00
Becky Gilbert	dbb001c0c7	Merge branch 'master' into respond-while-playing	2020-11-04 11:27:50 -08:00
Becky Gilbert	b02e73ea21	warn about .mov files - #649	2020-10-26 16:58:45 -07:00
Becky Gilbert	6396036c9e	add response_allowed_while_playing parameter - #1137	2020-10-26 14:47:30 -07:00
Angus Hughes	857db43166	maxdiff response column labels now more generic	2020-10-23 11:05:13 +08:00
awhug	1467f3b1e4	Initial pass of maxdiff plugin	2020-10-21 16:08:11 +08:00
Becky Gilbert	ee228b1419	change timing_response to trial_duration - #1096	2020-10-12 12:36:21 -07:00
Becky Gilbert	121428cf31	change start param to slider_start	2020-10-11 12:16:39 -07:00
Becky Gilbert	b3effcb015	fix inconsistencies in parameter info	2020-10-11 10:33:01 -07:00
Becky Gilbert	f92b9214b5	fixed inconsistencies in parameter info	2020-10-11 10:26:10 -07:00
Becky Gilbert	66ca55478e	fixed broken link	2020-10-10 19:19:24 -07:00
Becky Gilbert	c63d025f05	Merge pull request #694 from kachergis/master ... corrected trial type in example	2020-10-08 17:04:00 -07:00
Becky Gilbert	b81193756a	changed timing_response to trial_duration	2020-10-02 14:40:45 -07:00
Becky Gilbert	72a0c539e5	add slider start value to data generated	2020-10-02 14:27:39 -07:00
Becky Gilbert	f1c2bd35cf	revert docs update that was moved to docs-6.2 branch	2020-10-02 14:15:59 -07:00
Becky Gilbert	dd543cff96	fix typo	2020-10-02 14:13:25 -07:00
Becky Gilbert	09a8a4578e	sync with docs changed via PR merged into master	2020-10-02 14:08:52 -07:00