71 Commits

Author	SHA1	Message	Date
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
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	f1c2bd35cf	revert docs update that was moved to docs-6.2 branch	2020-10-02 14:15:59 -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
Gustavo Juantorena	ada7afbf89	Addded page_labe to plugin.info also changed docs	2020-09-27 03:05:35 -03:00
Gustavo Juantorena	a96721272d	starting the documentation for virtual chin rest plugin	2020-09-25 20:12:13 -03:00
kachergis	5f2a534748	fixed example trial type in video-button-response plugin	2020-07-10 20:18:15 -07:00
kachergis	2358c10e7a	corrected trial type	2020-04-20 13:34:41 -07:00
Josh de Leeuw	e714214fc4	check TOC; make necessary changes #617	2019-07-15 14:55:36 -04:00
Josh de Leeuw	5a56431f8d	add name option for survey plugins #608	2019-07-15 12:06:10 -04:00
Josh de Leeuw	c83e115f9b	add name option to survey-text #608	2019-07-15 10:54:26 -04:00
Josh de Leeuw	4c5c4af92c	adding documentation for #636	2019-07-15 10:25:06 -04:00
Josh de Leeuw	6cf949766a	adding documentation for video plugins #636	2019-07-12 17:02:06 -04:00
Josh de Leeuw	68d8c40ea6	remove old video plugin #636	2019-07-12 11:39:20 -04:00
Josh de Leeuw	c126b58f0a	implement scale_width #633	2019-07-11 10:29:47 -04:00
Josh de Leeuw	208ecf0365	some minor tweaks to survey-html-form plugin	2019-07-04 15:24:37 -04:00
Josh de Leeuw	7d01510a24	Merge pull request #602 from jansim/master ... Added very simple alternative jspsych-survey-html-form plugin	2019-07-04 15:19:13 -04:00
Josh de Leeuw	9bed32fb0f	implements settable width for sliders (#631)	2019-07-04 15:10:52 -04:00
Josh de Leeuw	338b3d5351	add docs for #573	2019-07-03 12:27:30 -04:00
Josh de Leeuw	381d2778b1	Merge branch 'pr/575'	2019-07-02 22:15:50 -04:00
Josh de Leeuw	9da8c452f2	implement image size settings for image plugins #560	2019-07-02 21:55:15 -04:00
Josh de Leeuw	c480d17743	update docs for #629	2019-07-02 16:41:34 -04:00
Josh de Leeuw	fd52dcb481	change examples to use placeholder #627	2019-07-02 11:08:46 -04:00
Josh de Leeuw	cd82ddfc1d	implements #627	2019-07-02 11:06:41 -04:00
Josh de Leeuw	e80ea04b04	working on randomization of survey orders #305	2019-07-01 13:33:07 -04:00
Josh de Leeuw	29645d540c	add docs for randomize_question_order (#305)	2019-06-20 09:37:09 -04:00
Josh de Leeuw	fd3c15c8ce	implementing random order for survey-likert (#305)	2019-06-19 17:03:27 -04:00
Josh de Leeuw	89e9023460	update docs re: preloading audio (#524)	2019-06-04 13:52:50 -04:00
Josh de Leeuw	627b4b2d50	Merge pull request #555 from sprengholz/master ... Cloze Test	2019-05-31 16:46:53 -04:00
Jan Simson	40d50e89a2	html-form-plugin: Return JS Object instead of JSON String	2019-04-04 10:43:57 -04:00
Jan Simson	5462dc200d	Added test & basic documentation for jspsych-surve-html-form plugin	2019-03-20 15:27:57 -04:00
alisdt	4651b5d3c2	Replace jQuery in example with vanilla JS	2019-02-04 12:21:36 +00:00
Robert Gibboni	560a655c64	option to set video playback rate	2019-01-23 15:23:25 -08:00
Zhanwen "Phil" Chen	fc7f7cc9e8	Update jspsych-same-different-image.md ... Type "same-different" is undefined.	2019-01-05 11:05:46 -06:00
Josh de Leeuw	0fcc566228	fix formatting bug #578	2018-11-30 14:48:57 -05:00
Sivananda Rajananda	e49ba9d0ab	Rename jspsych-RDK.md to jspsych-rdk.md	2018-11-27 16:36:27 -08:00
CML2	dd64b0a00e	changed RDK to lowercase	2018-11-27 16:26:32 -08:00
CML2	8408f59746	Changed to lowercase rdk and fixed border bug	2018-11-27 16:19:53 -08:00
Josh de Leeuw	8c5d83b258	implement required parameter for survey-text plugin (#460)	2018-11-09 14:10:09 -05:00