568 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Josh de Leeuw	2897c611f1	try img tag	2015-03-09 11:07:48 -04:00
Josh de Leeuw	640e038a6e	no center	2015-03-09 10:59:14 -04:00
Josh de Leeuw	3fe0314a7a	center?	2015-03-09 10:58:54 -04:00
Josh de Leeuw	8b6a35c639	edit readme with logo	2015-03-09 10:57:10 -04:00
Josh de Leeuw	dafb64fbd8	resolve merge conflict	2015-02-19 12:31:29 -05:00
Josh de Leeuw	0bd7a3f5d4	update version	2015-02-19 12:24:12 -05:00
Josh de Leeuw	49f1c09282	add examples	2015-02-19 11:45:41 -05:00
Josh de Leeuw	a5ed62a550	remove logging	2015-02-19 11:45:36 -05:00
Josh de Leeuw	fd202fcd21	add examples	2015-02-19 10:47:30 -05:00
Josh de Leeuw	c0e9fb8d8e	example	2015-02-19 10:33:55 -05:00
Josh de Leeuw	b9ea8853ac	more examples	2015-02-19 10:32:10 -05:00
Josh de Leeuw	6334bd84d7	add val-animate-occlusion style	2015-02-19 10:32:03 -05:00
Josh de Leeuw	7f9db95c5d	update docs loc	2015-02-19 10:24:33 -05:00
Josh de Leeuw	4a04c8bded	add docs about auto loading audio	2015-02-19 10:19:41 -05:00
Josh de Leeuw	a1900a199b	allow skip_load_check ... issue #92	2015-02-19 10:15:59 -05:00
Josh de Leeuw	f998f29c4f	more examples	2015-02-18 20:05:03 -05:00
Josh de Leeuw	8271a03a82	bug fix when preamble is not defined	2015-02-18 20:04:58 -05:00
Josh de Leeuw	7f77cfe5b1	update cite info	2015-02-18 18:37:33 -05:00
Josh de Leeuw	7b471950a0	update cite info	2015-02-18 18:29:46 -05:00
Josh de Leeuw	bf3dd20bad	add tests	2015-02-18 17:10:33 -05:00
Josh de Leeuw	1218c58350	fix bug	2015-02-18 17:10:26 -05:00
Josh de Leeuw	4e2fb7c8e5	add palmer test	2015-02-18 16:19:23 -05:00
Josh de Leeuw	6a46d65df0	fix raphael -> snapsvg	2015-02-18 16:18:41 -05:00
Josh de Leeuw	fc6626b4f7	add examples	2015-02-18 15:08:36 -05:00
Josh de Leeuw	a6df7ee289	fix typo	2015-02-18 15:08:29 -05:00
Josh de Leeuw	a503585598	multi stim update	2015-02-18 15:08:19 -05:00
Josh de Leeuw	13f3cf7f48	css for free-sort	2015-02-18 14:47:01 -05:00
Josh de Leeuw	5453518f0d	force parameter size	2015-02-18 14:33:23 -05:00
Josh de Leeuw	5cb5f0bfe7	bug fix with keyboard listener	2015-02-18 14:27:38 -05:00
Josh de Leeuw	fafa254860	call function example	2015-02-18 13:23:42 -05:00
Josh de Leeuw	a8804d2e2b	remove protocol-relative url	2015-02-18 13:23:32 -05:00
Josh de Leeuw	77b28d2ecf	adding more tests	2015-02-18 12:59:27 -05:00
Josh de Leeuw	849c468275	bug fixes	2015-02-18 12:27:26 -05:00
Josh de Leeuw	29a57fbe14	adding tests&examples folder	2015-02-18 12:27:18 -05:00
Josh de Leeuw	79b06f665a	minor issue with timing = 0	2015-02-18 11:44:53 -05:00
Josh de Leeuw	1c82ef4c32	Merge pull request #115 from mariansauter/patch-4 ... allow timing_max_search = 0	2015-02-18 11:31:48 -05:00
Josh de Leeuw	22748866b3	update example php ... issue #110	2015-02-18 11:22:43 -05:00
Josh de Leeuw	37c7966d9c	change id for palmer plugin ... issue #78	2015-02-18 11:16:53 -05:00
Josh de Leeuw	be74b923ec	modify docs for snapsvg ... issue #113	2015-02-18 11:16:35 -05:00
Josh de Leeuw	d4d31e27a2	replace Raphael with Snap ... issue #78	2015-02-18 11:12:05 -05:00
mariansauter	d30dac1dbe	allow timing_max_search = 0 ... I added the possibility that the timing_max_search equals 0 so that the search display is not shown at all (circumventing setTimeout) This might be very specifically handy for my purpose, because I can use the same plugin to show my probe at the fixation stimulus place before the actual search display. In any case, this change does not hurt and just allows timing_max_search = 0 to work	2015-02-11 23:28:29 +01:00
Josh de Leeuw	d42a8b2598	Merge pull request #112 from mariansauter/patch-2 ... added jspsych-visual-search-circle to css	2015-02-11 12:44:37 -05:00
Josh de Leeuw	b4cb51294a	Merge pull request #111 from mariansauter/patch-1 ... CRITICAL bugfix jspsych-visual-circle-search	2015-02-11 12:44:25 -05:00
mariansauter	ed55a92ef2	added jspsych-visual-search-circle to css	2015-02-11 16:52:42 +01:00
mariansauter	a10f881847	CRITICAL bugfix jspsych-visual-circle-search ... line 79: "display_element.appent" wasn't working, spelling error, makes whole plugin unrunnable	2015-02-11 16:42:10 +01:00
Josh de Leeuw	c780dd4557	add sample method ... issue #102	2015-02-05 17:19:08 -05:00