1818 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	e2d66c4de1	Merge pull request #2 from GEJ1/GEJ1/master ... Gej1/master	2021-02-18 10:43:42 -05:00
Josh de Leeuw	dc3a8e4460	fix extra ' +	2021-02-18 10:40:45 -05:00
Josh de Leeuw	2da7e6ccaa	more refactoring	2021-02-18 10:39:08 -05:00
Josh de Leeuw	6b973402fd	remove more unused variables	2021-02-18 09:45:05 -05:00
Josh de Leeuw	ba1c830aa4	remove unused variable	2021-02-18 09:44:44 -05:00
Josh de Leeuw	631d15f3cb	rename to startBlindSpotPhase	2021-02-18 09:43:58 -05:00
Josh de Leeuw	bfdcaf0804	Merge pull request #1 from GEJ1/pr/pjkohler/1442 ... refactor	2021-02-18 09:40:05 -05:00
Josh de Leeuw	bc33117135	refactor	2021-02-17 17:35:23 -05:00
GEJ1	a9bbc9664a	I remove: all the jQuery code, the mouse_adjustment option because use the jQuery slider.	2021-02-15 15:47:25 -03:00
GEJ1	99925639e0	Comments with jqueryToVanilla lines of code, but without change it	2021-02-14 15:53:20 -03:00
GEJ1	e2244eecb6	Documentation: screen resize and distance are optional	2021-02-02 15:18:09 -03:00
GEJ1	c9b95d377a	Documents: deg data and resize functionalities	2021-02-02 13:03:04 -03:00
GEJ1	69b86ee328	documentation: the last commit was incomplete	2021-02-02 11:45:50 -03:00
GEJ1	637f654961	Documentation completed. Also I added description in some parameters.	2021-02-02 11:26:39 -03:00
Peter J. Kohler	b038c66370	forgot to add try ... catch back into the code	2021-01-31 18:03:18 -05:00
Peter J. Kohler	2c5a45e90d	fixed mouse-based scaling	2021-01-31 18:01:44 -05:00
GEJ1	35881c1e9a	little change in prompts in order to have language consistency	2021-01-30 13:04:22 -03:00
Peter J. Kohler	24f185d3b0	button prompts added	2021-01-29 17:30:54 -05:00
Peter J. Kohler	000d64b9f6	removed unnecessary functions	2021-01-28 21:35:27 -05:00
Peter J. Kohler	9f7df71ae1	deleted one of the no longer useful functions	2021-01-28 21:27:31 -05:00
Peter J. Kohler	e4d7a7c46c	removing commented out older code	2021-01-28 20:25:21 -05:00
Peter J. Kohler	1555a9e718	blindspot measurement optional	2021-01-28 20:23:16 -05:00
GEJ1	1f813bc9f3	documentation update and resize decision (true or false)	2021-01-28 14:56:15 -03:00
Peter J. Kohler	e1d42e6a0f	resizing built-in	2021-01-27 19:41:41 -05:00
Peter J. Kohler	a4d97ceb28	function renamed	2021-01-27 18:35:14 -05:00
Peter J. Kohler	99bbe3c0d1	modifications to virtual chinrest	2021-01-26 10:20:52 -05:00
Gustavo Juantorena	49f68b7b7e	Revert "Addded page_labe to plugin.info also changed docs" ... This reverts commit ada7afbf89.	2020-09-27 03:44:35 -03:00
Gustavo Juantorena	ada7afbf89	Addded page_labe to plugin.info also changed docs	2020-09-27 03:05:35 -03:00
Gustavo Juantorena	a96721272d	starting the documentation for virtual chin rest plugin	2020-09-25 20:12:13 -03:00
Gustavo Juantorena	e1ec9852c8	Fixed problem going to next trial	2020-09-25 19:11:29 -03:00
Gustavo Juantorena	c515d43c0d	virtual chin plugin	2020-08-31 17:54:23 -03:00
Gustavo Juantorena	47726004cb	jsPsych-virtual-chin-rest.js new plugin	2020-08-31 17:36:08 -03:00
Josh de Leeuw	2cbd571a18	Delete .travis.yml	2020-08-14 22:37:57 -04:00
Josh de Leeuw	5d25665f75	fix actions file	2020-08-14 22:36:37 -04:00
Josh de Leeuw	ee60d13492	fix string error	2020-08-14 22:35:17 -04:00
Josh de Leeuw	1cbcde844f	use node 14.x for tests	2020-08-14 22:34:08 -04:00
Josh de Leeuw	c82664dc48	Add GitHub Action for Jest Testing	2020-08-14 22:32:25 -04:00
Josh de Leeuw	83980085ef	Update README.md	2020-05-21 11:35:25 -04:00
Josh de Leeuw	9de501e9da	Merge pull request #667 from hrcn/patch-1 ... Variable name error?	2020-01-29 16:06:01 -05:00
Rui Han	a5650993ed	Variable name error?	2020-01-29 16:02:24 -05:00
Josh de Leeuw	87571e9cc9	fixes #659	2019-10-17 15:46:26 -04:00
Josh de Leeuw	d3094bb088	Merge pull request #658 from becky-gilbert/master ... Added Code of Conduct	2019-10-17 10:15:10 -04:00
Becky Gilbert	9a75d5f5f1	revert changes to video plugins	2019-10-17 15:00:15 +01:00
Becky Gilbert	854f91a378	added BG to contributors	2019-10-17 10:09:16 +01:00
Becky Gilbert	5a95b8dee4	modified CoC text	2019-10-17 10:08:05 +01:00
Becky Gilbert	8b18d2c43d	fixed formatting issue	2019-08-30 14:56:03 +01:00
Becky Gilbert	ce12eb8858	fixed bug in video-* plugin data	2019-08-30 14:40:25 +01:00
Becky Gilbert	7f40db7de7	added CoC	2019-08-30 14:33:06 +01:00
Josh de Leeuw	542a6b1734	Merge pull request #643 from cthorey/fix-rdk-fixation-cross-color ... [FIX] fixation_cross_color in the rdk plugin	2019-07-22 17:13:37 -04:00
clement thorey	173aa28d64	[FIX] typo	2019-07-22 20:16:41 +01:00