229 Commits

Author	SHA1	Message	Date
Josh de Leeuw	584f702d85	remove similarity plugin docs #403	2017-06-30 23:25:49 -04:00
Josh de Leeuw	d9b3deb582	remove palmer plugin - fixes #401 ... Snap library is not handling event listeners correctly, or some other change to jsPsych broke compatibility. Either way, this plugin isn't used enough to warrant the effort to make it compatible right now.	2017-06-30 23:24:10 -04:00
Josh de Leeuw	bdb797f473	remove multi-picture plugin #404	2017-06-26 13:21:49 -04:00
Josh de Leeuw	47c890e429	change default button label	2017-06-26 11:46:31 -04:00
KristinDiep	b2fe7100df	fixed IAT plugin and doc	2017-06-21 11:16:47 -04:00
Josh de Leeuw	48574dccab	update iat to remove prompt parameter	2017-06-21 09:15:53 -04:00
Josh de Leeuw	c739dfcb3b	add new sampling option, fixes #398	2017-06-20 11:40:05 -04:00
Josh de Leeuw	15c6ec4385	link to new plugins	2017-06-19 22:26:17 -04:00
Josh de Leeuw	e75004285d	adding docs for #390	2017-06-19 22:26:06 -04:00
Josh de Leeuw	777446c1a7	docs and tests for #295	2017-06-19 21:49:14 -04:00
Josh de Leeuw	6cf245dd8a	change text plugin interface for mouse events	2017-06-19 11:03:26 -04:00
Josh de Leeuw	c64dc38e30	fix link #227	2017-06-16 21:28:18 -04:00
Josh de Leeuw	085b53e691	update docs for data summary changes #227	2017-06-16 21:26:32 -04:00
Josh de Leeuw	4d571fee92	docs for #349	2017-06-13 10:00:58 -04:00
Josh de Leeuw	a16977e31f	more docs for #325	2017-06-13 10:00:58 -04:00
Josh de Leeuw	32e9c8c803	document progress bar changes #325	2017-06-13 10:00:58 -04:00
Josh de Leeuw	4bc7920272	docs changes	2017-06-13 10:00:57 -04:00
Josh de Leeuw	ff8f006a7c	add button_label documentation #365 #360	2017-06-13 10:00:57 -04:00
Josh de Leeuw	854a2d8368	docs for #361	2017-06-13 10:00:57 -04:00
Josh de Leeuw	fb7089d187	add docs for #380	2017-06-13 10:00:57 -04:00
Josh de Leeuw	149ed1eef9	documentation update for #384	2017-06-13 10:00:57 -04:00
Josh de Leeuw	7feb43c1f8	fixes #394	2017-06-13 10:00:57 -04:00
KristinDiep	0b460a9313	fix in example	2017-05-26 15:41:16 -04:00
KristinDiep	03cf890c5c	Merge branch 'master' of https://github.com/kristiyip/jsPsych ... Need update	2017-05-26 15:36:48 -04:00
KristinDiep	92ef82aac8	minor fixes	2017-05-26 15:36:33 -04:00
KristinDiep	0ef858450c	Merge branch 'master' of https://github.com/kristiyip/jsPsych ... Nee to update.	2017-05-26 11:21:55 -04:00
Josh de Leeuw	ad1b887024	Merge pull request #342 from Ahoidal/enhanced_video_plugin ... Added start and stop parameters to video plugin	2017-05-25 13:27:55 -04:00
Josh de Leeuw	e129f832fc	update docs for removing fullscreen from ini #380	2017-05-24 22:23:54 -04:00
KristinDiep	4b8d332762	Merge remote-tracking branch 'upstream/master' ... Need to update fork with upstream.	2017-04-17 17:11:10 -04:00
KristinDiep	8539582705	created docs for IAT	2017-04-13 00:39:12 -04:00
KristinDiep	0b2e14781f	moved age folder to imgand removed container div	2017-04-11 08:59:36 -04:00
Josh de Leeuw	84de9aed7e	add resize plugin #352	2017-03-20 13:58:41 -04:00
Josh de Leeuw	f339d6d558	update docs on data storage	2017-03-20 09:44:11 -04:00
Josh de Leeuw	e5ec087990	fix preload_audio, preload_images	2017-03-06 14:58:14 -05:00
Josh de Leeuw	cbe1bb760e	remove dead link	2017-03-04 09:42:38 -05:00
Josh de Leeuw	4406a6bad5	documenting new trial properties	2017-03-04 09:41:56 -05:00
Antonia Hoidal	9f515870e5	Added start and stop parameters to video plugin	2017-02-21 13:27:27 -05:00
Xiaolu bai	08e47a68f3	Changes wording in introduction	2017-02-13 14:39:31 -08:00
Xiaolu bai	47b0f1b328	Changes wording in introduction	2017-02-13 14:36:35 -08:00
Xiaolu Bai	58ae31511c	Merge branch 'master' of github.com:jodeleeuw/jsPsych into multi_picture_multi_select_plug_in_docs_example	2017-02-13 14:21:36 -08:00
Xiaolu Bai	3b9160f8f7	survey-multi-select survey-multi-picture plug-ins ... -examples included -docs included	2017-02-13 14:12:47 -08:00
Josh de Leeuw	262fd06e3c	docs updates	2017-02-02 16:47:35 -05:00
aucuparia	4c2cf09b1a	Update creating-a-plugin.md ... Missing word.	2017-01-16 16:32:51 +01:00
Josh de Leeuw	c602a70116	clarify when on_data_update is called	2017-01-12 14:49:23 -05:00
Josh de Leeuw	a4ad32af66	docs updates; better RT tutorial	2017-01-12 14:44:03 -05:00
Josh de Leeuw	6301cb139d	fix #315 docs	2017-01-06 12:18:43 -05:00
Josh de Leeuw	45af5158e9	fixes #311	2017-01-06 12:10:04 -05:00
Josh de Leeuw	3520ba3c4c	fixes #312	2017-01-06 12:05:23 -05:00
Josh de Leeuw	8b425c9a45	Merge pull request #310 from GavinQ1/master ... jspsych-form-plugin	2017-01-04 16:05:02 -05:00
Josh de Leeuw	0240b9f6c9	Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery ... # Conflicts: # plugins/jspsych-html.js	2017-01-04 15:38:17 -05:00