483 Commits

Author	SHA1	Message	Date
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
Josh de Leeuw	136cc5103c	fix #1265	2020-12-03 14:04:37 -05:00
Josh de Leeuw	28b8714c29	fix bullet list	2020-12-03 14:04:20 -05:00
Josh de Leeuw	99e70b6a91	replace logo type	2020-12-03 14:04:08 -05: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
Josh de Leeuw	3fc8447fba	minor change at the end	2020-11-02 22:49:20 -05:00
Josh de Leeuw	7861b4471d	Minor changes	2020-11-02 22:44:09 -05:00
Becky Gilbert	7be11b72f4	first draft	2020-10-31 12:46:49 -07:00
Becky Gilbert	abc587184b	fix typo	2020-10-30 17:00:43 -07:00
Becky Gilbert	9f3fb74754	initial commit	2020-10-30 16:54:01 -07: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
Becky Gilbert	ac5c101c9d	add minimum_valid_rt parameter to jspsych.init	2020-10-23 09:05:29 -07:00
Angus Hughes	857db43166	maxdiff response column labels now more generic	2020-10-23 11:05:13 +08:00
Becky Gilbert	b82ee3f6c9	Merge pull request #668 from alisdt/master ... note that input to submitToTurk must be non-empty	2020-10-21 14:40:47 -07:00
awhug	1467f3b1e4	Initial pass of maxdiff plugin	2020-10-21 16:08:11 +08:00
Becky Gilbert	6a9f3575b6	update with changes to first/last functions	2020-10-20 16:17:39 -07: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	1bc3ac337c	Merge pull request #721 from vijaymarupudi/html5-fix ... Removed closing </link> tag	2020-10-08 17:20:25 -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	d619ed1d64	Merge pull request #707 from vijaymarupudi/doc-fix ... Updated to reflect that video preload is supported	2020-10-08 16:39:22 -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
Becky Gilbert	f2b49939da	add autocomplete parameter	2020-10-02 14:03:13 -07:00
Becky Gilbert	8e5af0e356	add autofocus parameter and example	2020-10-02 13:56:29 -07:00
Becky Gilbert	bc2809b3f1	remove files that were unintentionally added in PR	2020-10-01 16:58:06 -07:00
Becky Gilbert	55e581fff4	add missing parameters heading and text	2020-10-01 16:55:30 -07:00
Gustavo Juantorena	293338172f	Addded page_label to plugin jspsych-instructions also changed docs	2020-09-27 14:07:14 -03:00
Gustavo Juantorena	49f68b7b7e	Revert "Addded page_labe to plugin.info also changed docs" ... This reverts commit ada7afbf89.	2020-09-27 03:44:35 -03:00