616 Commits

Author	SHA1	Message	Date
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	b4ca37be1c	implement experiment_width #572	2019-07-11 10:21:50 -04:00
Josh de Leeuw	d120b3b470	implement alternating groups sample method (#528)	2019-07-08 21:53:40 -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	45a307f4d5	mturk doc update - thanks @kachergis!	2019-07-02 17:31:37 -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	86e381c96b	Merge branch 'master' of https://github.com/jspsych/jsPsych	2019-06-04 11:02:27 -04:00
Josh de Leeuw	3137eaaf13	add documentation of timelineVariable(..., true) (#607)	2019-06-04 11:02:19 -04:00
Josh de Leeuw	8eb344fbf1	Merge pull request #609 from retowyss/patch-1 ... Enable language option for progress bar	2019-06-03 16:47:16 -04:00
Josh de Leeuw	627b4b2d50	Merge pull request #555 from sprengholz/master ... Cloze Test	2019-05-31 16:46:53 -04:00
Josh de Leeuw	e5c1c85eaf	documentation for #604	2019-05-24 11:27:25 -04:00
Reto Wyss	51155ea3ba	document progress bar message	2019-04-13 02:39:35 +02: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
Josh de Leeuw	d27f52618f	update docs for video preload	2018-10-12 11:58:01 -04:00
Josh de Leeuw	501a5be52a	update all to performance.now() - #492	2018-10-09 16:13:59 -04:00
Josh de Leeuw	0c4080fe81	update progress bar docs #538	2018-10-09 13:26:55 -04:00
Josh de Leeuw	6a6d390cb8	add get of progress bar value (#538)	2018-10-09 13:21:53 -04:00
Josh de Leeuw	59258d3215	implements #324 -- beforeunload event handler	2018-10-09 13:12:07 -04:00
Josh de Leeuw	540ce2ed6f	step version	2018-10-04 15:31:37 -04:00
CML2	3d708804b2	changed timing_post_trial to post_trial_gap	2018-09-20 13:31:55 -07:00
CML2	7a5c980cbf	Added functionality for RDK to take in javascript character codes for choices and correct_choice parameters	2018-09-07 17:07:00 -07:00
Josh de Leeuw	c2bf4bb0aa	fix title of plugin doc	2018-08-24 13:52:06 -04:00
Philipp Sprengholz	53321cb9d5	Reworked documentation, added test file	2018-08-05 12:25:34 +02:00
Philipp Sprengholz	73c0f24be4	Simplified cloze plugin design	2018-08-02 07:20:47 +02:00
Josh de Leeuw	0b5b3004de	implement async option for call-function plugin #552	2018-07-31 10:48:54 -04:00
Josh de Leeuw	9accc0f060	patch documentation issue	2018-07-16 12:14:09 -04:00
Philipp Sprengholz	72c84130c5	Refined the cloze structure and added both example and doc files	2018-07-13 23:15:38 +02:00
Josh de Leeuw	b9a796211e	step version	2018-06-25 22:10:58 -04:00
Josh de Leeuw	25d23a8e0d	adding RDK plugin	2018-06-25 22:08:47 -04:00
Josh de Leeuw	fe29d2b255	Merge pull request #491 from vrsivananda/add-RDK ... Added RDK plugin	2018-06-25 22:02:19 -04:00
Josh de Leeuw	fe74cdefbf	update docs for #537	2018-06-25 21:48:57 -04:00
Josh de Leeuw	b6009b2de9	docs for #532	2018-06-25 21:37:32 -04:00
Josh de Leeuw	a6a012009c	update docs on localSave	2018-06-25 14:23:11 -04:00
Josh de Leeuw	b15261c09c	Merge pull request #530 from spencerking/master ... Fixing issue #261	2018-06-25 14:19:18 -04:00
Josh de Leeuw	3a3a792fed	fix two typos in docs	2018-05-30 13:23:02 -04:00
Sivananda Rajananda	10608969b7	Fixed multiple apertures nSets parameter and function	2018-05-22 11:35:51 -04:00
Spencer King	aa3df3591f	Fixing issue #261 ... localSave() is now supported by Safari	2018-05-16 22:12:05 -05:00
Josh de Leeuw	8678eed304	did not work	2018-05-14 23:02:33 -04:00
Josh de Leeuw	b7dd6ce0c8	try adding gitignore to docs for autobuild?	2018-05-14 23:01:08 -04:00
Josh de Leeuw	6173928409	step version in docs	2018-05-14 22:27:43 -04:00
CML2	7d5910f569	Fixed doc for RDK	2018-05-09 15:05:09 -07:00
Josh de Leeuw	c14b0f1d76	fix links to slider plugins	2018-04-20 09:02:03 -04:00
Josh de Leeuw	c6c4eff79f	fix typo in rt tutorial	2018-04-18 21:09:06 -04:00
Josh de Leeuw	1035b0f503	update version	2018-04-17 21:47:25 -04:00
Josh de Leeuw	b4a0ce33e6	fix docs, make callback optional #513	2018-04-17 10:43:37 -04:00
Josh de Leeuw	810df6c182	fix minor errors; step version #516	2018-04-17 10:38:34 -04:00
CML2	7b444afd59	Added multiple apertures and opposite coherence	2018-04-04 16:23:03 -07:00
Jon Gauthier	4a0ef29c07	Fix title	2018-02-28 10:39:19 -05:00
Josh de Leeuw	c1e7442f6c	Merge pull request #505 from yulkang/master ... corrected a typo in the rt-task tutorial regarding tagging	2018-02-18 22:28:34 +01:00
Josh de Leeuw	97d5b53c26	Merge pull request #507 from VorontsovIE/survey_text_bug ... default values in survey-text are now specified not in arrays	2018-02-18 22:27:31 +01:00
Josh de Leeuw	2c172a1caf	add a small delay between preload reattempts, documentation #503	2018-02-18 16:24:04 -05:00
Josh de Leeuw	f3d5a5043d	make webaudio optional #508	2018-02-18 16:19:09 -05:00
Ilya Vorontsov	ac98f87d06	default values in survey-text are now specified not in arrays	2018-02-17 00:36:32 +03:00
YulKang	788c864da8	corrected a typo in rt-task tutorial regarding tagging (colon was missing after "correct_response")	2018-02-15 15:34:04 +00:00
Josh de Leeuw	d693d34d05	update docs to clarify #499	2018-02-08 13:51:40 -05:00
Josh de Leeuw	bffbb67636	getData() -> get()	2018-01-12 14:04:37 -05:00
Josh de Leeuw	a4a9a97854	update docs for 6.0.1	2018-01-11 10:18:51 -05:00
Josh de Leeuw	4d6b8a7f38	prep 6.0.1	2018-01-11 10:17:44 -05:00
Josh de Leeuw	fd77ed9f48	update docs	2018-01-11 10:15:25 -05:00
Sivananda Rajananda	e2a028f862	Added RDK plugin	2018-01-10 14:23:08 -08:00
Josh de Leeuw	e7b6b919a9	update docs config, icon	2018-01-08 12:18:25 -05:00
Josh de Leeuw	bdffecf038	features -> overview	2018-01-03 16:01:34 -05:00
Josh de Leeuw	d65bbe0ffe	update docs location structure	2018-01-03 15:58:30 -05:00
Josh de Leeuw	dee50c29be	switching theme, updating docs	2018-01-03 15:35:57 -05:00
Josh de Leeuw	2857a9022e	remove docs ref to xab	2018-01-03 14:16:02 -05:00
Josh de Leeuw	6abdd01d7e	remove XAB plugin	2018-01-03 14:05:11 -05:00
Josh de Leeuw	f7966aeaf1	implements #489	2018-01-03 13:57:20 -05:00
Josh de Leeuw	9d3cfb65c8	adjusting docs for #488	2018-01-03 12:25:39 -05:00
Josh de Leeuw	97467a1f0d	fixing bad default values to more descriptive ones #488	2018-01-03 12:02:10 -05:00
Josh de Leeuw	a34757ed0f	minor doc update	2018-01-02 23:26:56 -05:00
Josh de Leeuw	71172ff551	docs updates	2018-01-02 22:49:20 -05:00
Josh de Leeuw	71d4ea8a50	docs updates	2018-01-02 22:26:11 -05:00
Josh de Leeuw	c93ce02e1b	docs updates	2018-01-02 18:50:35 -05:00
Josh de Leeuw	4ae3605174	docs update	2018-01-02 15:17:15 -05:00
Josh de Leeuw	a397d3eb2a	update exclusion docs #487	2018-01-02 15:01:49 -05:00
Josh de Leeuw	4a1dbca8e1	update docs	2018-01-02 14:56:26 -05:00
Josh de Leeuw	9ef744a51d	doc updates	2018-01-01 22:35:51 -05:00
Josh de Leeuw	ca3328ec82	some more docs updates	2018-01-01 22:12:41 -05:00
Josh de Leeuw	d9455ed2c0	updating plugin documentation	2017-12-30 23:35:37 -05:00
Josh de Leeuw	c3438c5f20	e.g. --> e.g., ... yay grammar	2017-12-29 21:51:06 -05:00
Josh de Leeuw	900ddd1545	fixes #484	2017-12-29 15:30:52 -05:00
Josh de Leeuw	a5bdbe3360	add docs for #486	2017-12-29 15:27:04 -05:00
Josh de Leeuw	2690355e4f	removing refs to text plugin	2017-12-20 13:12:17 -05:00
Josh de Leeuw	3fe0f803d7	fix plugin listing in docs	2017-12-20 13:08:26 -05:00
Josh de Leeuw	db6c50cb70	update overview page	2017-12-20 12:44:14 -05:00
Josh de Leeuw	676371e4ec	fixing old documentation	2017-12-20 11:48:18 -05:00
Josh de Leeuw	5ebfddd14d	docs update for #483	2017-12-20 11:25:32 -05:00
Josh de Leeuw	a36fb9cd2c	docs update	2017-12-11 19:55:21 -05:00
Josh de Leeuw	336ddca138	document #483	2017-12-08 21:17:39 -05:00
Josh de Leeuw	0e9d90fe3c	doc updates	2017-12-08 21:13:48 -05:00
Josh de Leeuw	fd78450ecf	remove audio buffer time, fixes #476	2017-12-06 12:57:15 -05:00
Josh de Leeuw	3affd77ddf	button label defaults #471	2017-09-20 09:37:29 -04:00
Josh de Leeuw	09ad9296c4	update grid-scene docs and demo	2017-09-14 22:27:55 -04:00
Josh de Leeuw	3c6f9a445a	remove is_html	2017-09-12 12:54:58 -04:00
Josh de Leeuw	e687f88e87	update tutorial content for new plugins	2017-09-12 12:42:38 -04:00
Josh de Leeuw	fa643fd275	update hello-world tutorial	2017-09-12 12:32:19 -04:00
mariansauter	2d86ac5506	fixed variable error	2017-09-08 14:42:17 +02:00
kristiyip	d342b059e3	Update jspsych-survey-text.md	2017-07-28 10:18:26 -04:00
kristiyip	582d9cb6d2	Update jspsych-survey-multi-select.md	2017-07-28 10:14:36 -04:00
kristiyip	e4b3f62596	Update jspsych-survey-multi-choice.md	2017-07-28 10:03:11 -04:00
kristiyip	7f684055e1	Update jspsych-survey-likert.md	2017-07-28 09:54:55 -04:00
KristinDiep	7a0b02993a	survey-likert doc	2017-07-28 09:53:50 -04:00
KristinDiep	5df6166473	Update survey plugin docs	2017-07-27 14:59:32 -04:00
Josh de Leeuw	eeaa2bba29	remove class=center-content	2017-07-17 21:45:32 -04:00
kristiyip	65e41900a0	Delete jspsych-xab.md	2017-07-14 14:33:52 -04:00
kristiyip	4debc6b4f7	Create jspsych-xab-image.md	2017-07-14 14:33:40 -04:00
kristiyip	7238812a87	Create jspsych-xab-html.md	2017-07-14 14:32:56 -04:00
kristiyip	4a934778fd	Update jspsych-vsl-animate-occlusion.md	2017-07-14 14:14:22 -04:00
kristiyip	1e1a61a53c	Update jspsych-visual-search-circle.md	2017-07-14 14:11:58 -04:00
kristiyip	c9d94ec1e8	Delete jspsych-text.md	2017-07-14 14:09:02 -04:00
kristiyip	3c0f557d13	Update jspsych-survey-multi-select.md	2017-07-14 14:07:45 -04:00
kristiyip	2f2c7e4dbc	Update jspsych-survey-multi-choice.md	2017-07-14 14:06:31 -04:00
kristiyip	83cfc22c39	Update jspsych-survey-likert.md	2017-07-14 14:05:24 -04:00
kristiyip	a63e1e2215	Delete jspsych-single-stim.md	2017-07-14 14:03:47 -04:00
kristiyip	21a6a6e6f6	Delete jspsych-single-audio.md	2017-07-14 14:03:37 -04:00
kristiyip	677d3501d1	Update jspsych-serial-reaction-time.md	2017-07-14 14:03:18 -04:00
kristiyip	2093ec74cb	Update jspsych-serial-reaction-time-mouse.md	2017-07-14 14:00:58 -04:00
kristiyip	75d6c8d97e	Delete jspsych-same-different.md	2017-07-14 13:55:04 -04:00
kristiyip	f387b74480	Create jspsych-same-different-image.md	2017-07-14 13:54:49 -04:00
kristiyip	f7420f1b01	Create jspsych-same-different-html.md	2017-07-14 13:53:06 -04:00
kristiyip	fa559499b8	Delete jspsych-multi-stim-multi-response.md	2017-07-14 13:46:01 -04:00
kristiyip	b94290904a	Create jspsych-image-slider-response.md	2017-07-14 12:14:34 -04:00
kristiyip	12b9c61df3	Create jspsych-image-keyboard-response.md	2017-07-14 12:12:38 -04:00
kristiyip	3455c0e4da	Create jspsych-image-button-response.md	2017-07-14 12:10:56 -04:00
kristiyip	fd20c0b700	Create jspsych-html-slider-response.md	2017-07-14 12:07:39 -04:00
kristiyip	c8caf2f0ea	Create jspsych-html-keyboard-response.md	2017-07-14 12:04:59 -04:00
kristiyip	691a0e980a	Create jspsych-html-button-response.md	2017-07-14 12:02:41 -04:00
kristiyip	05add4c391	Update and rename jspsych-html.md to jspsych-external-html.md	2017-07-14 11:58:10 -04:00
kristiyip	811fc2881d	Delete jspsych-categorize.md	2017-07-14 11:45:48 -04:00
kristiyip	2a23569ffd	Create jspsych-categorize-image.md	2017-07-14 11:45:37 -04:00
kristiyip	a0353f1852	Update jspsych-categorize-html.md	2017-07-14 11:43:55 -04:00
kristiyip	d6a5f90bb4	Create jspsych-categorize-html.md	2017-07-14 11:43:03 -04:00
kristiyip	00375a7e2f	Update jspsych-categorize-animation.md	2017-07-14 11:38:12 -04:00
kristiyip	e372639c9e	Delete jspsych-button-response.md	2017-07-14 11:37:12 -04:00
kristiyip	6e576d2e00	Update jspsych-call-function.md	2017-07-14 11:36:49 -04:00
kristiyip	b44c591ec1	Delete audio-slider-response.md	2017-07-14 10:38:30 -04:00
kristiyip	afd1cac5cc	Create jspsych-audio-slider-response.md	2017-07-14 10:37:33 -04:00
kristiyip	80a060c589	Create audio-slider-response.md	2017-07-14 10:36:48 -04:00
kristiyip	f4723cca3c	Update jspsych-audio-button-response.md	2017-07-14 10:21:46 -04:00
kristiyip	68d40f907e	Create jspsych-audio-keyboard-response.md	2017-07-14 10:20:37 -04:00
kristiyip	70c0e691b6	Update jspsych-audio-button-response.md	2017-07-14 10:16:53 -04:00
kristiyip	68c82d97e2	Create jspsych-audio-button-response.md	2017-07-14 10:06:45 -04:00
Josh de Leeuw	756c88a07f	better timing parameter names #425	2017-07-10 14:00:24 -04:00
Josh de Leeuw	6400862fd4	removing jQuery refs in docs	2017-07-09 23:05:15 -04:00
Josh de Leeuw	31e1fc190b	removing pluginAPI.evaluateFunctionParameters #426	2017-07-09 23:05:04 -04:00
Josh de Leeuw	a764ba75a4	More work on plugin ambiguity #422	2017-07-07 12:17:09 -04:00
Josh de Leeuw	2011677eba	Merge pull request #415 from kristiyip/master ... Added plugins to .yml	2017-07-06 15:52:01 -04:00
Josh de Leeuw	23397a0da7	finish separation of sample method #421	2017-07-06 15:48:33 -04:00
Josh de Leeuw	851467adb7	remove similarity plugin docs #403	2017-07-06 15:32:45 -04:00
Josh de Leeuw	97e2792b81	change default button label	2017-07-06 15:32:18 -04:00
kristiyip	e5228115e6	Create jspsych-iat-html.md	2017-07-06 13:59:09 -04:00
kristiyip	4ba25e3f4a	Update and rename jspsych-iat.md to jspsych-iat-image.md	2017-07-06 13:59:09 -04:00
KristinDiep	e047ed60b3	removed palmer and similarity in yml	2017-07-06 13:59:08 -04:00
KristinDiep	da04f658b5	edit .yml	2017-07-06 13:59:08 -04:00
KristinDiep	d81ef7d192	Should show <p> and <span> tag in doc	2017-07-06 13:59:07 -04:00
KristinDiep	8e44f0a285	fixed doc	2017-07-06 13:59:07 -04:00
Josh de Leeuw	bd87503555	adds new plugin, fixes #409	2017-07-02 22:08:23 -04:00
Josh de Leeuw	53d98cc206	one more clarification	2017-07-01 00:26:13 -04:00
Josh de Leeuw	5964fa0c95	clarifying data handling in docs	2017-07-01 00:23:38 -04:00
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	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