840 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
GavinQ1	ed9a6be58f	Update jspsych-form.md	2016-11-25 15:59:54 -05:00
GavinQ1	a4821a4882	fix doc	2016-11-25 15:57:57 -05:00
GavinQ1	ed91a5849c	fix doc	2016-11-25 15:55:47 -05:00
GavinQ1	fb4b6721af	doc update	2016-11-25 15:53:51 -05:00
GavinQ1	8b0c541157	doc update	2016-11-25 15:52:35 -05:00
GavinQ1	e9a06443aa	doc update	2016-11-25 15:50:39 -05:00
GavinQ1	a10e3cd7b0	doc update	2016-11-25 15:49:50 -05:00
GavinQ1	184c9f41e6	doc update	2016-11-25 15:48:50 -05:00
GavinQ1	253b6a0892	doc update	2016-11-25 15:47:18 -05:00
GavinQ1	7757928cde	add some comments	2016-11-25 15:44:42 -05:00
GavinQ1	64411690d1	check if all required field is filled	2016-11-25 15:39:30 -05:00
GavinQ1	483f2b85b4	add jspsych-form.js documentation	2016-11-25 15:36:27 -05:00
GavinQ1	a7533f9419	jspsych-form.js version 1.0 finised	2016-11-23 19:21:55 -05:00
GavinQ1	60b56576c2	jspsych-form.js version 1 finised	2016-11-23 19:20:49 -05:00
GavinQ1	ccd97f773a	commenting	2016-11-17 00:26:52 -05:00
GavinQ1	307657a8b5	support description	2016-11-16 18:57:06 -05:00
GavinQ1	c8223864fb	all basic stuff are done! :)	2016-11-14 20:32:33 -05:00
GavinQ1	49d770cf40	Merge branch 'master' of https://github.com/GavinQ1/jsPsych	2016-11-14 20:32:24 -05:00
GavinQ1	bbe0c68c8e	all basic stuff are done! :)	2016-11-14 20:31:07 -05:00
Eggplant	7f22f2f702	test vmware	2016-11-14 15:19:36 -05:00
GavinQ1	d66946f739	minor changes	2016-11-13 19:55:17 -05:00
GavinQ1	54750f7e93	inserting image checkbox switch	2016-11-13 19:46:20 -05:00
GavinQ1	3700e72e16	enable inserting image	2016-11-13 18:44:12 -05:00
GavinQ1	b776945f0b	most basic stuffs are done	2016-11-13 18:26:28 -05:00
GavinQ1	19a3251b0b	small modifications	2016-11-04 02:05:32 -04:00
GavinQ1	0c3199b88f	comment changes	2016-11-04 01:51:39 -04:00
GavinQ1	d0c49aa27f	Support MDL	2016-11-02 18:55:26 -04:00
GavinQ1	2e4a0a1a96	gitignore	2016-10-25 18:55:07 -04:00
GavinQ1	f1528a8af9	form-plugin-tests	2016-10-25 18:51:32 -04:00
Josh de Leeuw	c5fc6fdabf	correct [ ] in docs	2016-09-01 16:56:01 -04:00
Josh de Leeuw	6286c1192e	implements #287	2016-08-22 22:55:42 -04:00
Josh de Leeuw	5ec3d6a95d	updating examples	2016-08-16 11:19:37 -04:00
Josh de Leeuw	a2e9f8674c	progress bar fixes	2016-08-16 11:16:14 -04:00
Josh de Leeuw	e713f94166	remove semicolon	2016-08-16 10:59:42 -04:00
Josh de Leeuw	51b439c160	css touchup	2016-08-16 10:56:02 -04:00
Josh de Leeuw	0346d99810	test / example for #283	2016-08-16 00:14:24 -04:00
Josh de Leeuw	0bdfd39702	fixes #285	2016-08-15 23:58:13 -04:00
Josh de Leeuw	17f0aa6fa0	fixes #284	2016-08-15 23:48:02 -04:00
Josh de Leeuw	eaddc223e1	demo updates	2016-08-15 23:21:46 -04:00
Josh de Leeuw	113c674133	adjusting examples	2016-08-15 22:55:39 -04:00
Josh de Leeuw	1a1db497c9	use new getData features	2016-08-15 18:37:06 -04:00
Josh de Leeuw	bb7009e374	fix indexing bug	2016-08-15 18:34:47 -04:00