1491 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
KristinDiep	bf1da9375d	added nested params in survey plugins	2017-07-23 13:04:39 -04:00
Josh de Leeuw	c08d2f1df2	add polyfill for Array.isArray	2017-07-22 12:35:02 -04:00
Josh de Leeuw	15535820e0	allows object parameters to have nested timelineVariables	2017-07-21 22:11:43 -04:00
Josh de Leeuw	12dcd30ad9	better deepCopy util	2017-07-21 22:11:19 -04:00
Josh de Leeuw	d21dea8b9a	add universalPluginParameters	2017-07-19 13:13:42 -04:00
Josh de Leeuw	62a39f18db	fix #449	2017-07-17 21:51:29 -04:00
Josh de Leeuw	1b9ed49eca	multi-select example #449	2017-07-17 21:50:04 -04:00
Josh de Leeuw	f9682859c2	reconstruction example #449	2017-07-17 21:47:50 -04:00
Josh de Leeuw	eeaa2bba29	remove class=center-content	2017-07-17 21:45:32 -04:00
Josh de Leeuw	f3674497c3	Merge pull request #448 from kristiyip/master ... All plugins have md, deleted plugin md if plugin no longer exists	2017-07-17 10:52:57 -04:00
KristinDiep	505121e455	edited examples	2017-07-17 10:19:41 -04:00
Josh de Leeuw	624c8d6f8b	use default values when param=null	2017-07-14 23:31:47 -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