504 Commits

Author	SHA1	Message	Date
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	aa7629f6d2	fix formatting and broken link	2020-12-08 11:32:17 -08:00
Becky Gilbert	1c6037f249	update links to CORS section, add message_progress_bar param	2020-12-08 11:30:24 -08:00
Becky Gilbert	9c711416b8	update link to CORS section	2020-12-08 11:28:06 -08:00
Becky Gilbert	4f568a93a3	add manual update example and custom message option	2020-12-08 11:26:42 -08:00
Becky Gilbert	a4e809dac4	fix incorrect plugin order and typo	2020-12-08 11:25:09 -08:00
Becky Gilbert	d87fd2a6cf	fix out-of-date links, add links, tweak wording	2020-12-08 11:24:04 -08:00
Becky Gilbert	8c50d15a21	update example labels	2020-12-08 11:22:01 -08:00
Becky Gilbert	d4cf29ca54	fix exclude-browser link	2020-12-08 11:19:15 -08:00
Becky Gilbert	82c0eeafb3	fix typo in localSave link	2020-12-07 13:46:14 -08:00
Becky Gilbert	4f81bc1f57	first draft of running expts page, replaces collecting data page (now the "online" section)	2020-12-07 13:16:47 -08:00
Becky Gilbert	455343c672	ref running experiments page in use_webaudio section, add min RT and override safe mode options	2020-12-07 13:15:14 -08:00
Becky Gilbert	3f8f5fe73f	ref running experiments page, update video stimulus param	2020-12-07 13:06:56 -08:00
Becky Gilbert	fbb38b0f01	clarify ovoerride_safe_mode param description	2020-12-04 13:00:30 -08:00
Becky Gilbert	79b5554897	fix incorrect default	2020-12-04 10:14:16 -08:00
Becky Gilbert	a433d81c90	merge in the video parameter name changes from master	2020-12-03 15:43:15 -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
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	2f73392370	add override_safe_mode parameter to jsPsych.init	2020-12-02 17:42:18 -08: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
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