210 Commits

Author	SHA1	Message	Date
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
GavinQ1	c0a5a3ab4d	support customized submit actions/better example for illustrating features	2016-12-14 15:39:58 -05:00
GavinQ1	450c923ab1	Add correct field regarding to suggestion from issue#305	2016-12-12 17:40:59 -05:00
GavinQ1	58fcd204e6	fix doc	2016-12-09 12:45:16 -05:00
GavinQ1	ce00de889c	View modifications	2016-12-02 21:56:13 -05:00
Josh de Leeuw	590f5880fe	more jquery removal	2016-11-28 14:59:32 -05:00
GavinQ1	ed9a6be58f	Update jspsych-form.md	2016-11-25 15:59:54 -05:00
GavinQ1	a4821a4882	fix doc	2016-11-25 15:57:57 -05:00
GavinQ1	ed91a5849c	fix doc	2016-11-25 15:55:47 -05:00
GavinQ1	fb4b6721af	doc update	2016-11-25 15:53:51 -05:00
GavinQ1	8b0c541157	doc update	2016-11-25 15:52:35 -05:00
GavinQ1	e9a06443aa	doc update	2016-11-25 15:50:39 -05:00
GavinQ1	a10e3cd7b0	doc update	2016-11-25 15:49:50 -05:00
GavinQ1	184c9f41e6	doc update	2016-11-25 15:48:50 -05:00
GavinQ1	253b6a0892	doc update	2016-11-25 15:47:18 -05:00
GavinQ1	483f2b85b4	add jspsych-form.js documentation	2016-11-25 15:36:27 -05:00
Wolfgang Walther	0bf0b6297a	Copy missing plugin examples to docs	2016-10-26 14:07:08 +02:00
Wolfgang Walther	8512bee22c	Docs: jspsych-survey plugins fixes ... Leftover from survey-text in survey-multi-choice Grammar (responses / response)	2016-10-23 18:19:45 +02:00
Wolfgang Walther	7a6ab3504d	on_trial_finish callback is passed the trial_data	2016-10-23 16:53:16 +02:00
Josh de Leeuw	1b7f4f8aea	documentation updates for version 6	2016-10-13 13:34:33 -04:00