Josh de Leeuw 0240b9f6c9 Merge remote-tracking branch 'refs/remotes/origin/master' into no-jquery ... # Conflicts: # plugins/jspsych-html.js		2017-01-04 15:38:17 -05:00
..
callbacks.md	on_trial_finish callback is passed the trial_data	2016-10-23 16:53:16 +02:00
data.md	change dataAsCSV and dataAsJSON to getDataAsCSV and getDataAsJSON #283	2016-08-15 18:14:41 -04:00
exclude-browser.md	support exclusions for WebAudio API #253	2016-08-10 16:13:05 -04:00
fullscreen.md	fix docs #219	2016-01-11 10:42:17 -05:00
functions-as-parameters.md	update all features pages in docs	2016-01-07 09:08:36 -05:00
media-preloading.md	fixes #258	2016-05-16 13:46:28 -04:00
mturk.md	update all features pages in docs	2016-01-07 09:08:36 -05:00
progress-bar.md	update all features pages in docs	2016-01-07 09:08:36 -05:00
record-browser-interactions.md	grammar	2016-08-10 13:19:33 -04:00
timeline.md	more jquery removal	2016-11-28 14:59:32 -05:00