250 Commits

Author	SHA1	Message	Date
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	a9ed50f5d2	mkdocs config	2017-01-06 13:02:18 -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
Josh de Leeuw	4c8881d9c2	docs updates	2016-10-12 16:48:10 -04:00
Josh de Leeuw	c5fc6fdabf	correct [ ] in docs	2016-09-01 16:56:01 -04:00
Josh de Leeuw	6286c1192e	implements #287	2016-08-22 22:55:42 -04:00
Josh de Leeuw	546739bf35	change dataAsCSV and dataAsJSON to getDataAsCSV and getDataAsJSON #283	2016-08-15 18:14:41 -04:00
Josh de Leeuw	301ffbe3b3	remove doc links #283	2016-08-15 18:06:11 -04:00
Josh de Leeuw	3cfde8a504	remove data.getTrialsOfType and data.getDataByTrialIndex	2016-08-15 18:02:43 -04:00
Josh de Leeuw	2132163127	change cont_key to choices in text plugin for consistency	2016-08-12 17:01:16 -04:00
Josh de Leeuw	110b56d015	add info on repetitions for timelines	2016-08-12 10:21:31 -04:00
Josh de Leeuw	ad93ccd33a	More docs on timeline variables #250 #281	2016-08-12 10:16:03 -04:00
Josh de Leeuw	15f75f6592	start documenting timeline variables #250	2016-08-11 23:32:25 -04:00
Josh de Leeuw	5fde5c27dd	support exclusions for WebAudio API #253	2016-08-10 16:13:05 -04:00
Josh de Leeuw	237572c3ea	first implementation of automatic exclusions #253. implements min_width and min_height.	2016-08-10 15:22:27 -04:00
Josh de Leeuw	da0ffc3b66	document central registration of timeouts #272	2016-08-10 14:17:15 -04:00
Josh de Leeuw	6d9458f746	add missing param for likert - #249	2016-08-10 13:22:46 -04:00
Josh de Leeuw	f3d36d80f9	grammar	2016-08-10 13:19:33 -04:00
Josh de Leeuw	45ffb876fd	document #273	2016-08-10 13:13:52 -04:00
Josh de Leeuw	3b910469d3	standardize ALL_KEYS and NO_KEYS (#252)	2016-06-30 13:20:34 -04:00
Josh de Leeuw	bc7f0f0f1a	fixes #254	2016-06-30 10:22:36 -04:00
Josh de Leeuw	2eac727b3f	docs for #273	2016-06-29 23:17:27 -04:00
Josh de Leeuw	01f7782da6	Implements a solution for #228	2016-06-29 17:34:59 -04:00
Josh de Leeuw	a2e458615a	implements data.ignore method (#264)	2016-06-27 22:55:35 -04:00
Josh de Leeuw	e17882c46a	minor doc fix	2016-06-27 16:28:53 -04:00
Josh de Leeuw	093c58cebb	documentation error - fixes #263	2016-06-15 10:09:27 -04:00
Josh de Leeuw	5bd6756ba6	adds video plugin (#162)	2016-06-15 10:05:36 -04:00
Josh de Leeuw	fb31532071	documentation for #232 ... closes #232	2016-05-22 12:35:35 -04:00
Josh de Leeuw	9d4d294bad	document #259	2016-05-21 22:20:04 -04:00
Josh de Leeuw	a5e528507c	Merge pull request #260 from jodeleeuw/timeline-variables ... Timeline variables	2016-05-21 20:35:04 -04:00
Josh de Leeuw	4acfce42b6	fix #258	2016-05-21 17:25:42 -04:00
Josh de Leeuw	faea546f94	implements #248	2016-05-21 17:22:36 -04:00
Josh de Leeuw	8aa1641d9f	Fixes #246	2016-05-21 17:18:05 -04:00
Josh de Leeuw	2d60aa2071	fixes #245	2016-05-21 16:42:55 -04:00
Josh de Leeuw	38574f639a	fixes #258	2016-05-16 13:46:28 -04:00
Matteo Visconti dOC	4eb8fece3b	DOC: minor fixes to tutorial	2016-05-03 16:44:23 -04:00
Jana Klaus	388829c287	Fixed typo in plugin links	2016-03-02 18:43:19 +01:00
Jana Klaus	9ed87db59d	Rename tutorial.md to flanker.md	2016-03-02 18:15:53 +01:00
Jana Klaus	c844666446	Added tutorial for flanker task	2016-03-02 18:15:23 +01:00
Jana Klaus	3b9d23b1fb	Added tutorial for flanker task	2016-03-02 18:13:23 +01:00
Josh de Leeuw	d465b13a8f	fixes #226	2016-01-26 08:54:17 -05:00
Josh de Leeuw	6099145133	update main page docs	2016-01-23 22:38:29 -05:00
Josh de Leeuw	0e70316256	fix missing button-response doc	2016-01-15 15:23:12 -05:00
Josh de Leeuw	ded7896208	fix docs #219	2016-01-11 10:42:17 -05:00
Josh de Leeuw	560907b0a1	docs updates	2016-01-07 12:08:44 -05:00
Josh de Leeuw	465d6f6ca8	looping and conditional timeline docs	2016-01-07 10:37:03 -05:00
Josh de Leeuw	9a85fc3392	updating plugin docs to 5.0	2016-01-07 10:18:54 -05:00
Josh de Leeuw	8bc8075026	update all features pages in docs	2016-01-07 09:08:36 -05:00
Josh de Leeuw	28be553dd0	lots of docs updates to get plugin pages to 5.0	2016-01-06 23:15:02 -05:00
Josh de Leeuw	260132a63c	rt task tutorial docs update	2016-01-06 17:18:09 -05:00
Josh de Leeuw	0a894284eb	docs updates for main page, theme, and timelines	2016-01-06 09:19:35 -05:00
Josh de Leeuw	e1d9d4fb14	change tutorial for 5.0	2016-01-05 22:39:35 -05:00
Josh de Leeuw	103eaf192d	updating pluginAPI module docs	2016-01-05 16:06:46 -05:00
Josh de Leeuw	17cb2cd1f7	getting data docs renamed, renaming some data functions	2016-01-05 14:36:08 -05:00
Josh de Leeuw	84df6d3c62	docs for core functions	2016-01-05 14:14:44 -05:00
Josh de Leeuw	95419af8ae	renaming chunks to timeline	2016-01-05 14:04:01 -05:00
Josh de Leeuw	5ff4e2666a	add randomID method (#214)	2016-01-05 13:31:52 -05:00
Josh de Leeuw	b289e182d5	allow end_message in endExperiment (#213)	2016-01-05 13:16:56 -05:00
Josh de Leeuw	d917f74d3a	implements URL variables (#192)	2016-01-05 12:09:17 -05:00
Josh de Leeuw	9a9b7bba7a	adds dataAsJSON (#212)	2016-01-05 11:34:53 -05:00
Josh de Leeuw	77a29acfd7	siphon plugins into .plugins namespace (#184)	2016-01-05 10:16:58 -05:00
Josh de Leeuw	fbc1fa2a9c	various docs updates, especially converting to new mkdocs format	2016-01-05 10:06:36 -05:00
Josh de Leeuw	a042a0d63d	updating preloading docs	2015-12-17 15:24:00 -05:00
Josh de Leeuw	59d2e0b451	update plugins to match timeline node method	2015-12-14 16:56:20 -05:00
Josh de Leeuw	82ce051210	Merge pull request #167 from vergenzt/same-different-self-pacing ... Improvements to same-different plugin	2015-12-08 16:44:25 -05:00
Josh de Leeuw	a96d927629	add multi-choice plugin, modify multi-stim-multi-response ... supersedes #174 & #177	2015-12-08 15:13:16 -05:00