1050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	66fea32f5b	don't reset data properties	2016-12-16 13:33:19 -05:00
Josh de Leeuw	099c1da963	remove ref to ignored data	2016-12-16 11:26:00 -05:00
Josh de Leeuw	3d1c2b9ac9	add test	2016-12-16 11:24:30 -05:00
Josh de Leeuw	cf5306d9f6	modify test	2016-12-16 11:18:51 -05:00
Josh de Leeuw	05b255dc5c	reset data storage if .init() is called.	2016-12-16 11:10:48 -05:00
Josh de Leeuw	d7d6d5b971	test addProperties	2016-12-16 11:05:47 -05:00
Josh de Leeuw	f125065451	fix ^ -> Math.pow()	2016-12-15 22:18:22 -05:00
Josh de Leeuw	7736561191	fix sd test	2016-12-15 22:14:45 -05:00
Josh de Leeuw	788ea0833b	fix sqrt()	2016-12-15 22:08:43 -05:00
Josh de Leeuw	b4c63c607f	more tests of datacollection	2016-12-15 22:06:56 -05:00
Josh de Leeuw	30a7401e92	missing .length	2016-12-15 21:59:29 -05:00
Josh de Leeuw	c8ff0ad884	bug	2016-12-15 21:56:56 -05:00
Josh de Leeuw	c1fbe542df	datacollection tests	2016-12-15 21:53:52 -05:00
Josh de Leeuw	7806cd14e6	More changes to how data is handled...	2016-12-15 21:38:22 -05:00
Josh de Leeuw	22cc5bf878	DataCollection and DataColumn, breaks code for now.	2016-12-15 15:13:18 -05:00
Josh de Leeuw	f40c848543	year updates	2016-12-15 11:43:38 -05:00
Josh de Leeuw	41cd3e87a7	don't remove DOM element when adding progress bar!	2016-12-15 11:29:23 -05:00
Josh de Leeuw	b24f951f45	fix typo	2016-12-15 11:29:09 -05:00
Josh de Leeuw	698bba5fee	modify examples	2016-12-15 11:10:13 -05:00
Josh de Leeuw	74acf2c7b1	fixes flexbox layout for IE11	2016-12-15 11:10:05 -05:00
Josh de Leeuw	22d46bcab8	better html5 audio fallback #311	2016-12-15 11:09:36 -05:00
GavinQ1	0b568d6b40	better order of outputs	2016-12-14 15:52:23 -05:00
GavinQ1	f7407cfe5c	fix a bug	2016-12-14 15:46:00 -05:00
GavinQ1	c0a5a3ab4d	support customized submit actions/better example for illustrating features	2016-12-14 15:39:58 -05:00
Josh de Leeuw	4e95436a58	changes default_iti #312	2016-12-14 13:53:39 -05:00
Josh de Leeuw	1c60540396	html5 fallback for webaudio #311	2016-12-14 12:16:07 -05:00
GavinQ1	450c923ab1	Add correct field regarding to suggestion from issue#305	2016-12-12 17:40:59 -05:00
Josh de Leeuw	3e9390061f	change node version	2016-12-12 12:04:18 -05:00
Josh de Leeuw	917b95ecea	Add Travis-CI	2016-12-12 11:56:23 -05:00
Josh de Leeuw	5f40e184b9	basic testing with jest working	2016-12-10 11:03:53 -05:00
Josh de Leeuw	df49035118	first jest test runs!	2016-12-09 21:25:56 -05:00
Josh de Leeuw	e0bf9d8ef4	npm package	2016-12-09 21:12:45 -05:00
GavinQ1	91b99e1d56	Merge branch 'master' of https://github.com/GavinQ1/jsPsych	2016-12-09 12:46:20 -05:00
GavinQ1	58fcd204e6	fix doc	2016-12-09 12:45:16 -05:00
Josh de Leeuw	60e82e4167	remove jquery from button-response plugin	2016-12-07 11:20:05 -05:00
Josh de Leeuw	8d0bb37eea	remove ref to jquery script in examples	2016-12-07 11:19:54 -05:00
Josh de Leeuw	6d85cba679	removing jquery from two examples	2016-12-06 13:20:06 -05:00
Josh de Leeuw	d901078801	fixed free sort plugin with no jquery	2016-12-06 13:09:09 -05:00
Josh de Leeuw	c109373902	almost there...	2016-12-04 22:07:19 -05:00
GavinQ1	d200e8be3b	Delete Thumbs.db	2016-12-02 22:53:59 -05:00
GavinQ1	cff3ce29fe	remove test folder	2016-12-02 22:35:36 -05:00
GavinQ1	ce00de889c	View modifications	2016-12-02 21:56:13 -05:00
Josh de Leeuw	8ca1272d89	see you later jquery	2016-12-02 21:50:28 -05:00
Josh de Leeuw	4580d272a5	bye bye jquery!	2016-12-02 11:26:44 -05:00
Josh de Leeuw	590f5880fe	more jquery removal	2016-11-28 14:59:32 -05:00
Josh de Leeuw	3010623880	lots of jquery cleanup	2016-11-28 14:31:16 -05:00
Josh de Leeuw	773c585c50	updating plugin files to remove jquery	2016-11-26 23:06:26 -05:00
GavinQ1	a2e7acdd05	fix the html example	2016-11-25 22:05:30 -05:00
GavinQ1	c4642fa876	Merge branch 'master' of https://github.com/GavinQ1/jsPsych	2016-11-25 21:55:15 -05:00
GavinQ1	61907d358f	remove dependency on jQuery	2016-11-25 21:53:52 -05:00