1513 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Josh de Leeuw	8f4b42fa8c	Merge branch 'master' of https://github.com/jspsych/jsPsych	2017-08-02 11:57:04 -04:00
Josh de Leeuw	7e2db2c1c8	fixes #458	2017-08-02 11:57:00 -04:00
Josh de Leeuw	740f571148	Merge pull request #455 from kristiyip/master ... survey plugin docs	2017-07-28 14:12:54 -04:00
KristinDiep	6ed2d86036	test free-sort	2017-07-28 14:08:19 -04:00
KristinDiep	ec72fade4b	pretty name in survey plugins	2017-07-28 13:34:54 -04:00
KristinDiep	feef97c170	test categorize-animation	2017-07-28 12:05:14 -04:00
KristinDiep	6a514704c6	fixed merge conflict	2017-07-28 10:19:57 -04:00
KristinDiep	0857c8a1b4	survey docs	2017-07-28 10:18:50 -04: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	e5e385ebb5	instructions merge conflict	2017-07-27 15:01:44 -04:00
KristinDiep	5df6166473	Update survey plugin docs	2017-07-27 14:59:32 -04:00
KristinDiep	69f509b396	fixed examples	2017-07-27 11:10:56 -04:00
Josh de Leeuw	37222c5b94	add a test for nested timeline variables and data parameter	2017-07-26 15:41:19 -04:00
Josh de Leeuw	fcc8878e37	add complex parameter type	2017-07-26 15:17:12 -04:00
Josh de Leeuw	e07100f85e	Merge pull request #451 from jspsych/pr/450 ... Pr/450	2017-07-26 12:05:39 -04:00
Josh de Leeuw	0c73c39995	fix issues from review	2017-07-26 12:04:54 -04:00
KristinDiep	e537037af7	updated questions for survey plugins	2017-07-24 09:58:22 -04:00
KristinDiep	19b610ffb9	deleted position_demo	2017-07-23 13:08:20 -04:00
KristinDiep	b7dca21ecf	fix merge conflict	2017-07-23 13:06:37 -04:00