724 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	e8db59b44b	don't try to auto preload functions	2016-05-21 17:09:39 -04:00
Josh de Leeuw	613e692567	fix bug from #233	2016-05-21 16:53:54 -04:00
Josh de Leeuw	2d60aa2071	fixes #245	2016-05-21 16:42:55 -04:00
Josh de Leeuw	437747b32f	fix #247 bug	2016-05-21 16:39:12 -04:00
Josh de Leeuw	f1c7de661c	test combined pause/unpause with adding new trials	2016-05-18 17:29:22 -04:00
Josh de Leeuw	88ea761973	quick bug fixes	2016-05-18 17:29:03 -04:00
Josh de Leeuw	01b78b54b9	implement pause/unpause #232	2016-05-18 17:21:25 -04:00
Josh de Leeuw	ecbdfa50dd	implements adding node to end of timeline	2016-05-18 17:04:14 -04:00
Josh de Leeuw	38574f639a	fixes #258	2016-05-16 13:46:28 -04:00
Josh de Leeuw	94e884ca1e	fix window reference for server-side use	2016-04-14 15:35:27 -04:00
Josh de Leeuw	e011ced826	remove dependency on window object for query_string	2016-04-13 18:30:02 -04:00
Josh de Leeuw	3432d0286f	a slightly more sophisticated test	2016-04-07 15:16:52 -04:00
Josh de Leeuw	2367a276f2	major cleanup, and basic level test works.	2016-04-07 15:01:50 -04:00
Josh de Leeuw	3e1bae218c	first (buggy) implementation of timeline variables	2016-04-06 18:28:49 -04:00
Josh de Leeuw	1a715c86ad	fixes #237 and adds test	2016-03-02 23:15:06 -05:00
Josh de Leeuw	a98d2cf2fe	fixes #240	2016-03-02 23:07:00 -05:00
Josh de Leeuw	d101b1f0f7	alphabetize	2016-03-02 14:29:38 -05:00
Josh de Leeuw	f69ca3b940	rename flanker demo, fix missing )	2016-03-02 14:28:19 -05:00
Josh de Leeuw	c75e546990	add test for conditional first trial on the timeline	2016-03-02 14:20:25 -05:00
Josh de Leeuw	f0365e2d55	Merge pull request #243 from janakl4us/master ... Added flanker task to the tests&examples folder	2016-03-02 14:18:51 -05:00
Jana Klaus	397586256d	Update flanker.html	2016-03-02 18:47:06 +01:00
Jana Klaus	e8f35eb19a	Corrected links to plugins	2016-03-02 18:46:43 +01:00
Jana Klaus	388829c287	Fixed typo in plugin links	2016-03-02 18:43:19 +01:00
Jana Klaus	9fd74e34fe	Added images for flanker task	2016-03-02 18:25:34 +01:00
Jana Klaus	dd33d27101	Create flanker.html	2016-03-02 18:24:53 +01:00
Josh de Leeuw	3162199202	Merge pull request #242 from janakl4us/master ... Tutorial for flanker task	2016-03-02 12:20:29 -05:00
Jana Klaus	b64c7e06f5	Update contributors.md	2016-03-02 18:16:58 +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	0d0778c639	fix all examples that called jsPsych.preloadImages	2016-01-31 11:03:16 -05:00
Josh de Leeuw	8ccd4534c1	update example to work in 5.x	2016-01-26 09:01:09 -05: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	d6ba7c9a26	fixes #222	2016-01-23 22:35:45 -05:00
Josh de Leeuw	9c6396cba3	remove old empty function	2016-01-23 22:30:05 -05:00
Josh de Leeuw	58bd9c9550	fixes #223	2016-01-23 22:23:38 -05:00
Josh de Leeuw	38300144a5	update readme	2016-01-23 22:18:29 -05:00
Josh de Leeuw	f39cf89dc2	fix bugs in examples	2016-01-15 15:23:19 -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	cf3aff605b	remove notes file	2016-01-07 16:52:10 -05:00
Josh de Leeuw	6d58ad6e19	Merge pull request #216 from jodeleeuw/5.0-timelinenode ... 5.0 timelinenode	2016-01-07 16:46:40 -05:00
Josh de Leeuw	e46df96ada	modify example	2016-01-07 16:34:10 -05:00
Josh de Leeuw	4de65db9d9	fixes #211	2016-01-07 16:34:03 -05:00
Josh de Leeuw	1ad4c256e2	testing #215	2016-01-07 12:08:51 -05:00
Josh de Leeuw	560907b0a1	docs updates	2016-01-07 12:08:44 -05:00