807 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	1b7f4f8aea	documentation updates for version 6	2016-10-13 13:34:33 -04:00
Josh de Leeuw	4c8881d9c2	docs updates	2016-10-12 16:48:10 -04:00
Josh de Leeuw	94e06aa33d	adjust single-audio test to include function call.	2016-10-07 09:18:55 -04:00
Josh de Leeuw	fd458fec74	add SRT plugin #295	2016-10-07 09:18:40 -04:00
Josh de Leeuw	c5fc6fdabf	correct [ ] in docs	2016-09-01 16:56:01 -04:00
Josh de Leeuw	6286c1192e	implements #287	2016-08-22 22:55:42 -04:00
Josh de Leeuw	5ec3d6a95d	updating examples	2016-08-16 11:19:37 -04:00
Josh de Leeuw	a2e9f8674c	progress bar fixes	2016-08-16 11:16:14 -04:00
Josh de Leeuw	e713f94166	remove semicolon	2016-08-16 10:59:42 -04:00
Josh de Leeuw	51b439c160	css touchup	2016-08-16 10:56:02 -04:00
Josh de Leeuw	0346d99810	test / example for #283	2016-08-16 00:14:24 -04:00
Josh de Leeuw	0bdfd39702	fixes #285	2016-08-15 23:58:13 -04:00
Josh de Leeuw	17f0aa6fa0	fixes #284	2016-08-15 23:48:02 -04:00
Josh de Leeuw	eaddc223e1	demo updates	2016-08-15 23:21:46 -04:00
Josh de Leeuw	113c674133	adjusting examples	2016-08-15 22:55:39 -04:00
Josh de Leeuw	1a1db497c9	use new getData features	2016-08-15 18:37:06 -04:00
Josh de Leeuw	bb7009e374	fix indexing bug	2016-08-15 18:34:47 -04:00
Josh de Leeuw	35028aa50b	update demo to use new getData features	2016-08-15 18:21:08 -04:00
Josh de Leeuw	546739bf35	change dataAsCSV and dataAsJSON to getDataAsCSV and getDataAsJSON #283	2016-08-15 18:14:41 -04:00
Josh de Leeuw	301ffbe3b3	remove doc links #283	2016-08-15 18:06:11 -04:00
Josh de Leeuw	3cfde8a504	remove data.getTrialsOfType and data.getDataByTrialIndex	2016-08-15 18:02:43 -04:00
Josh de Leeuw	296664e382	improving examples	2016-08-15 17:17:51 -04:00
Josh de Leeuw	e46b84941f	begin implementing data filters #283	2016-08-15 17:17:43 -04:00
Josh de Leeuw	0128e74540	error message if display_element does not exist	2016-08-15 16:29:30 -04:00
Josh de Leeuw	2b5f40b84f	add msg	2016-08-12 22:43:54 -04:00
Josh de Leeuw	2132163127	change cont_key to choices in text plugin for consistency	2016-08-12 17:01:16 -04:00
Josh de Leeuw	2efa5fefeb	CSS rules for vertical centering	2016-08-12 16:54:15 -04:00
Josh de Leeuw	512e81cb61	space	2016-08-12 12:28:48 -04:00
Josh de Leeuw	6d3da21adb	remove all plugin specific CSS from jspsych.css	2016-08-12 12:26:04 -04:00
Josh de Leeuw	110b56d015	add info on repetitions for timelines	2016-08-12 10:21:31 -04:00
Josh de Leeuw	ad93ccd33a	More docs on timeline variables #250 #281	2016-08-12 10:16:03 -04:00
Josh de Leeuw	15f75f6592	start documenting timeline variables #250	2016-08-11 23:32:25 -04:00
Josh de Leeuw	606600598c	implements features for #281	2016-08-10 16:58:30 -04:00
Josh de Leeuw	5fde5c27dd	support exclusions for WebAudio API #253	2016-08-10 16:13:05 -04:00
Josh de Leeuw	237572c3ea	first implementation of automatic exclusions #253. implements min_width and min_height.	2016-08-10 15:22:27 -04:00
Josh de Leeuw	31ae9b0e6a	implements #280	2016-08-10 14:23:50 -04:00
Josh de Leeuw	da0ffc3b66	document central registration of timeouts #272	2016-08-10 14:17:15 -04:00
Josh de Leeuw	09e50d9f51	convert plugins to use centralized setTimeout handler #272	2016-08-10 14:08:54 -04:00
Josh de Leeuw	6d9458f746	add missing param for likert - #249	2016-08-10 13:22:46 -04:00
Josh de Leeuw	f3d36d80f9	grammar	2016-08-10 13:19:33 -04:00
Josh de Leeuw	45ffb876fd	document #273	2016-08-10 13:13:52 -04:00
Josh de Leeuw	fa5d8b74fe	fixes #278	2016-08-10 12:58:39 -04:00
Josh de Leeuw	835b1664cd	Merge pull request #276 from PCLLAB/FixMissingComma ... Fix missing comma	2016-07-27 11:56:23 -04:00
LOG67	b4d537b3be	Fixed the missing comma which prevented jsPsych from working	2016-07-27 11:44:09 -04:00
LOG67	8ac8ca964a	Merge remote-tracking branch 'jodeleeuw/master'	2016-07-27 11:02:45 -04:00
Josh de Leeuw	68c0212e1c	update readme	2016-07-22 16:29:16 -04:00
Josh de Leeuw	d26a4d142d	update RT references	2016-07-22 16:26:03 -04:00
Josh de Leeuw	d269f11c5c	add on_interaction_data_update event to init settings	2016-07-22 16:12:33 -04:00
Josh de Leeuw	4ee25acafe	possible #274 fix?	2016-07-12 12:29:30 -04:00
Josh de Leeuw	434f7474ed	fix typos	2016-07-02 14:04:11 -04:00