564 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	81e1beeb0f	docs for #152	2015-06-12 13:06:39 -04:00
Josh de Leeuw	981d15fdc8	implements #98 & #152 ... adds a routine that detects when keys are being held down. an optional parameter for getKeyboardResponse allows held keys to be ignored.	2015-06-12 12:58:31 -04:00
Josh de Leeuw	b132e2a137	Merge pull request #151 from jodeleeuw/master ... merge master updates into dev	2015-06-12 12:49:57 -04:00
Josh de Leeuw	379d277705	Merge pull request #150 from boogheta/fix-imgs-paths ... fix paths for example files	2015-06-12 12:13:47 -04:00
Benjamin Ooghe-Tabanou	3daa75a308	fix paths for example files	2015-06-12 15:30:42 +02:00
Josh de Leeuw	c091cbaa28	fix bug in endExperiment ... caused on_finish handler to fire twice	2015-06-08 12:39:33 -04:00
Josh de Leeuw	29fefd874a	update docs url	2015-06-08 09:56:06 -04:00
Josh de Leeuw	952d9c7023	fix bug with persisting event handler	2015-06-08 09:49:16 -04:00
Josh de Leeuw	1974ff4498	fixes #147	2015-06-08 09:03:32 -04:00
Josh de Leeuw	cfe8c17c19	implements #145 ... includes docs update	2015-06-04 15:55:49 -04:00
Josh de Leeuw	3e9a945bbc	update release info in docs	2015-06-02 09:32:26 -04:00
Josh de Leeuw	240f409a06	fix bug with data and timing_post_trial function params	2015-06-02 09:27:05 -04:00
Josh de Leeuw	611280d40d	reduce image size	2015-05-29 08:31:52 -04:00
Josh de Leeuw	c0e5a86d86	update download link in docs	2015-05-29 08:28:41 -04:00
Josh de Leeuw	fb20caeb27	update tutorial examples for 4.2	2015-05-29 08:27:54 -04:00
Josh de Leeuw	71f451f4bb	restores text parameter in enforceArray	2015-05-29 08:16:41 -04:00
Josh de Leeuw	c575d03bdf	Merge branch 'dev' ... Conflicts: docs/markdown_docs/features/data.md docs/markdown_docs/plugins/jspsych-survey-likert.md	2015-05-28 14:44:25 -04:00
Josh de Leeuw	98f99782ee	minor docs updates	2015-05-28 14:41:18 -04:00
Josh de Leeuw	7051e3354f	implements #121	2015-05-28 13:46:02 -04:00
Josh de Leeuw	3d597a8f52	implements #107	2015-05-28 13:14:22 -04:00
Josh de Leeuw	eff15d8fa6	fixes #116	2015-05-28 12:45:43 -04:00
Josh de Leeuw	7f2b8d8d5c	fixes #123	2015-05-28 10:04:03 -04:00
Josh de Leeuw	37fa9d9113	implements #142	2015-05-28 09:58:47 -04:00
Josh de Leeuw	23653e7eef	implements #143	2015-05-28 09:45:21 -04:00
Josh de Leeuw	ba9f1bcb9c	docs for #130	2015-05-28 09:31:48 -04:00
Josh de Leeuw	723052b578	add instructions plugin	2015-05-27 12:10:33 -04:00
Josh de Leeuw	13906d27c8	fixes #141	2015-05-27 09:33:33 -04:00
Josh de Leeuw	d95b884c5a	fixes #129	2015-05-27 09:06:41 -04:00
Josh de Leeuw	744308e763	Merge remote-tracking branch 'origin/dev' into dev ... Conflicts: docs/markdown_docs/plugins/jspsych-survey-likert.md docs/markdown_docs/plugins/jspsych-survey-text.md	2015-05-27 09:02:40 -04:00
Josh de Leeuw	13b4d48cb4	fixes #139	2015-05-27 09:01:39 -04:00
Josh de Leeuw	9bba6fe2dd	finishes #104	2015-05-22 09:52:04 -04:00
Josh de Leeuw	99e9ceb8a8	fixes #140	2015-05-22 09:48:00 -04:00
Josh de Leeuw	af2543d566	starting to implement #104	2015-05-20 23:09:48 -04:00
Josh de Leeuw	c56cb5581d	Fixes #120	2015-05-20 22:29:55 -04:00
Josh de Leeuw	d3e14230d5	Fixes #138	2015-05-20 22:25:19 -04:00
Josh de Leeuw	996bd34faa	add thumbs.db	2015-05-20 22:21:00 -04:00
Josh de Leeuw	b948e4bc6f	fixes #134	2015-05-15 16:39:40 -04:00
Josh de Leeuw	9acb625d21	fixes #132	2015-05-15 16:33:34 -04:00
Josh de Leeuw	f539a28c88	Merge pull request #126 from dgromer/master ... Set link protocol in docs to https	2015-05-15 16:06:18 -04:00
Josh de Leeuw	d3f0c7d295	add docs for #137	2015-05-15 16:04:37 -04:00
Josh de Leeuw	4b4faa6636	fixes #105, #137	2015-05-15 15:31:39 -04:00
Josh de Leeuw	c7e1f40ddc	*actually* fixes #128	2015-05-15 15:16:00 -04:00
Josh de Leeuw	b5bb1a552d	fixes #128	2015-05-15 15:09:10 -04:00
Josh de Leeuw	bf9a0e9591	documenting changes from #136	2015-05-15 15:02:14 -04:00
Josh de Leeuw	f2871833c5	add a test for #136 ... test to make sure #136 works	2015-05-15 14:53:13 -04:00
Josh de Leeuw	d1f9985bf8	implements #136 ... does the stuff in #136. - adds the addProperties function - removes other ways to append data.	2015-05-15 14:46:12 -04:00
Josh de Leeuw	ab44b665a3	add list of variables that are always protected from norming ... fixes #133, and provides framework for other related issues.	2015-05-15 14:04:39 -04:00
dgromer	53e88f22e2	Set link protocol in docs to https	2015-03-29 15:41:11 +02:00
Josh de Leeuw	0cb807500f	avoid loading audio twice ... fixes issue #125	2015-03-27 13:43:11 -04:00
Josh de Leeuw	b8df41aa4e	swap logo	2015-03-09 11:10:08 -04:00