1373 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kristiyip	e5fae92814	Update README.md	2017-07-12 11:57:25 -04:00
kristiyip	b77053cda4	Update README.md	2017-07-12 11:56:44 -04:00
kristiyip	1d1c568087	Update README.md	2017-07-12 11:55:07 -04:00
kristiyip	87b894b983	Update README.md	2017-07-12 11:54:48 -04:00
kristiyip	499e9c53b1	Update README.md	2017-07-12 11:54:01 -04:00
kristiyip	ca13447950	Update README.md	2017-07-12 11:33:28 -04:00
kristiyip	e276a0b613	Update README.md	2017-07-12 11:32:56 -04:00
KristinDiep	48ee06ccc0	Merge remote-tracking branch 'upstream/master' ... Need to update code	2017-07-12 10:21:51 -04:00
KristinDiep	e6b55d7ce2	created demos	2017-07-12 10:21:35 -04:00
Josh de Leeuw	5d888912f9	starts #432	2017-07-12 09:58:27 -04:00
Josh de Leeuw	f36b85092d	remove trial level display element option	2017-07-12 09:37:25 -04:00
Josh de Leeuw	6970926460	fix platform fn.toString bug	2017-07-11 22:35:28 -04:00
Josh de Leeuw	5dec7d495d	change type specification	2017-07-11 22:19:42 -04:00
Josh de Leeuw	dde14ccb2b	all tests passing??	2017-07-11 11:08:49 -04:00
Josh de Leeuw	426d54ac06	Merge pull request #431 from kristiyip/master ... all test suites(except for timeline-variables.test) working	2017-07-11 10:58:58 -04:00
KristinDiep	496b2c8a37	all test suites(except for timeline-variables.test) working	2017-07-11 10:14:21 -04:00
Josh de Leeuw	5155f18ee6	Merge pull request #430 from kristiyip/master ... plugin.info implemented	2017-07-10 15:10:11 -04:00
KristinDiep	c46b9263aa	iat plugin example works	2017-07-10 15:08:29 -04:00
KristinDiep	cbb0643a95	some changes	2017-07-10 14:43:43 -04:00
KristinDiep	670b691da2	implemented plugin.info, some examples not working	2017-07-10 14:43:04 -04:00
Josh de Leeuw	756c88a07f	better timing parameter names #425	2017-07-10 14:00:24 -04:00
Josh de Leeuw	d920d40cfd	remove .only on test	2017-07-10 10:57:21 -04:00
Josh de Leeuw	74a7acd334	Merge pull request #429 from kristiyip/master ... html button, keyboard, and slider tests	2017-07-10 10:56:02 -04:00
Josh de Leeuw	8f19625c6b	testing for new method of evaluation function params #426	2017-07-10 10:55:00 -04:00
KristinDiep	6f1c409c54	html-slider-response test finished	2017-07-10 10:43:57 -04:00
KristinDiep	ddc123a3f4	html-button-response test finished	2017-07-10 10:26:59 -04:00
KristinDiep	270416be88	html-keyboard-response test done	2017-07-10 09:59:14 -04:00
KristinDiep	3d161376af	image-slider-response test	2017-07-10 09:12:46 -04:00
KristinDiep	13930f9e40	added params to image-slider-response	2017-07-10 09:12:46 -04:00
Josh de Leeuw	7a6b72f88d	more testing repairs	2017-07-09 23:52:42 -04:00
Josh de Leeuw	f292f0c1ae	get some tests passing again	2017-07-09 23:32:12 -04:00
Josh de Leeuw	d3e06db3a4	fix bug to avoid checking type parameter	2017-07-09 23:32:01 -04:00
Josh de Leeuw	74da90c320	remove palmer plugin	2017-07-09 23:31:44 -04:00
Josh de Leeuw	a55d0448f9	remove jquery comment from form plugin	2017-07-09 23:05:58 -04:00
Josh de Leeuw	6400862fd4	removing jQuery refs in docs	2017-07-09 23:05:15 -04:00
Josh de Leeuw	31e1fc190b	removing pluginAPI.evaluateFunctionParameters #426	2017-07-09 23:05:04 -04:00
Josh de Leeuw	c372efe1d1	locate evaluation of function parameters inside jsPsych core #426	2017-07-09 21:15:59 -04:00
Josh de Leeuw	a1567ceba7	remove array brackets from plugin types	2017-07-09 21:15:22 -04:00
Josh de Leeuw	7433638dc6	remove old merge conflict (??) stuff	2017-07-07 15:10:14 -04:00
Josh de Leeuw	4c2a0b4cd9	remove logo file	2017-07-07 15:09:57 -04:00
Josh de Leeuw	6f8fce3605	update readme to use url logo	2017-07-07 15:09:42 -04:00
Josh de Leeuw	4863f2e9c3	remove evaluateFunctionParameter	2017-07-07 14:54:47 -04:00
Josh de Leeuw	dd3a65dd9f	Merge pull request #427 from kristiyip/master ... plugin tests	2017-07-07 14:48:27 -04:00
KristinDiep	225fbf7474	image-button response test	2017-07-07 14:46:33 -04:00
KristinDiep	ee8e23d8d8	image-button-response test	2017-07-07 14:46:33 -04:00
KristinDiep	9e715e2457	iat-image, iat-html, image-keyboard-response tests done	2017-07-07 14:46:33 -04:00
KristinDiep	598174d0a8	audio and html slider response	2017-07-07 14:46:33 -04:00
Josh de Leeuw	fd6b66063c	remove ambiguity for xab/sd #422	2017-07-07 14:13:14 -04:00
Josh de Leeuw	d6d23133ab	fix query string bug	2017-07-07 13:23:29 -04:00
Josh de Leeuw	cb90bde564	param clarification #422	2017-07-07 12:23:02 -04:00