1536 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	27ae629aa6	fixed indentation	2018-01-01 22:08:58 -05:00
Josh de Leeuw	fea8d270ca	save stimulus info	2018-01-01 22:04:11 -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	e89c947de7	jest upgrade, fixing tests to work with upgrade of jsdom	2017-12-28 16:07:15 -05:00
Josh de Leeuw	051c0839bf	add on_load function #486	2017-12-28 16:06:31 -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	906f43376b	implements on_start #483	2017-12-08 21:13:38 -05:00
Josh de Leeuw	35bff7baa3	fixes #474	2017-12-07 20:39:33 -05:00
Josh de Leeuw	23b0f9ea83	support custom start values #472	2017-12-07 16:35:07 -05:00
Josh de Leeuw	a4c0135a4a	record stimulus #473	2017-12-06 14:58:44 -05:00
Josh de Leeuw	6cce1d3898	add audio demos, fixes #481	2017-12-06 12:57:33 -05:00
Josh de Leeuw	fd78450ecf	remove audio buffer time, fixes #476	2017-12-06 12:57:15 -05:00
Josh de Leeuw	de9dff4e4a	update template for plugin.info method	2017-11-22 12:40:50 -05:00
Josh de Leeuw	e77ebcedbb	Merge pull request #478 from teonbrooks/patch-1 ... Update jspsych.css	2017-11-02 09:02:31 -04:00
Teon L Brooks	767083d307	Update jspsych.css ... typo in style.css	2017-11-01 23:01:00 -07:00
Josh de Leeuw	6aea5c78bf	fix errors in plugin	2017-10-12 13:12:14 -04:00
Josh de Leeuw	50145ad6be	Merge branch 'master' of https://github.com/jspsych/jsPsych	2017-09-20 09:37:31 -04:00
Josh de Leeuw	3affd77ddf	button label defaults #471	2017-09-20 09:37:29 -04:00
Josh de Leeuw	e6fe32824c	Update jspsych-categorize-html.html	2017-09-15 13:26:18 -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
Josh de Leeuw	f04879770d	Merge pull request #468 from mariansauter/patch-5 ... fixed variable error	2017-09-08 09:00:08 -04:00
mariansauter	2d86ac5506	fixed variable error	2017-09-08 14:42:17 +02:00
Josh de Leeuw	b53dae0119	Merge branch 'master' of https://github.com/jspsych/jsPsych	2017-09-01 10:01:15 -04:00
Josh de Leeuw	b1d76d3f30	fix abs() issue with shrinking box	2017-09-01 10:01:11 -04:00
Josh de Leeuw	1885be8e36	Merge pull request #464 from andrewheusser/video-stop-event-handler ... added event handler to video plugin to end trial when a stop time is specified	2017-08-25 16:20:04 -04:00
andrewheusser	13b4f88786	added event handler to end trial when a stop time is specified	2017-08-25 15:32:38 -04:00