HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
926 Commits 14 Branches 506 Tags 58 MiB
fd765347b8
Commit Graph

926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
fd765347b8 update contributors doc 2017-01-04 21:54:14 -05:00
Josh de Leeuw
f3668df9d8 move from tests&examples --> examples 2017-01-04 16:07:56 -05:00
Josh de Leeuw
8b425c9a45 Merge pull request #310 from GavinQ1/master 
jspsych-form-plugin
 2017-01-04 16:05:02 -05:00
GavinQ1
52660ffef2 Create .gitignore 2017-01-04 16:03:08 -05:00
Josh de Leeuw
a89b993efe Merge pull request #317 from jodeleeuw/no-jquery 
Remove all jQuery, implement testing framework
 2017-01-04 15:42:47 -05:00
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
Josh de Leeuw
053fc1bcd1 test join method of DataCollection 2017-01-04 15:25:28 -05:00
Josh de Leeuw
552a86c2a7 one innerHTML call per plugin write. 2017-01-04 15:25:14 -05:00
Josh de Leeuw
4fc383cab1 manual preloading from init method 2017-01-04 15:25:01 -05:00
Josh de Leeuw
354ff1dc94 add DataCollection.first and .last 2016-12-31 14:39:53 -05:00
Josh de Leeuw
e821ae6bb0 add DataColumn.all 2016-12-31 14:19:51 -05:00
Josh de Leeuw
c5a6414477 adding tests 2016-12-28 22:44:25 -05:00
GavinQ1
ee4755fcaa Add some comment 2016-12-27 23:04:06 -05:00
GavinQ1
a30088fe48 Merge branch 'master' of https://github.com/GavinQ1/jsPsych 2016-12-27 22:47:41 -05:00
GavinQ1
1d36cdaaa3 fix bug: checkbox/radio/switch/.values 2016-12-27 22:46:58 -05:00
Josh de Leeuw
789ce325b7 just use node 6.6 for now 2016-12-22 17:20:14 -05:00
Josh de Leeuw
a932a50e02 try different node version 2016-12-22 17:13:05 -05:00
Josh de Leeuw
7a966c2248 add ConvertKeyCodeToKeyCharacter, variance, min, max 2016-12-22 17:00:48 -05:00
Josh de Leeuw
658b1db363 implement pluginapi tests 2016-12-20 13:21:13 -05:00
Josh de Leeuw
72deca2348 centralize keyboard listeners for better held_key detection 2016-12-20 11:28:24 -05:00
Josh de Leeuw
3dc02fd5d1 start testing pluginAPI 2016-12-20 10:39:08 -05:00
Josh de Leeuw
f7b917adaa replace .which with .keyCode 2016-12-20 10:38:20 -05:00
Josh de Leeuw
2d46484365 fixes audio load bug #308 2016-12-20 09:24:53 -05:00
Josh de Leeuw
d583752919 testing data module 2016-12-18 15:20:29 -05:00
Josh de Leeuw
db8730d4b3 testing and fixing data module 2016-12-18 11:31:35 -05:00
Josh de Leeuw
347c7d0a66 fix DataCollection bugs 2016-12-17 15:40:19 -05:00
Josh de Leeuw
575df21241 add tests for filter() and filterCustom() 2016-12-17 15:40:02 -05:00
GavinQ1
4ec585a4d8 Delete Thumbs.db 2016-12-16 21:16:51 -05:00
Josh de Leeuw
979ee70d58 fix addToAll, test it 2016-12-16 14:00:15 -05:00
Josh de Leeuw
66fea32f5b don't reset data properties 2016-12-16 13:33:19 -05:00
Josh de Leeuw
099c1da963 remove ref to ignored data 2016-12-16 11:26:00 -05:00
Josh de Leeuw
3d1c2b9ac9 add test 2016-12-16 11:24:30 -05:00
Josh de Leeuw
cf5306d9f6 modify test 2016-12-16 11:18:51 -05:00
Josh de Leeuw
05b255dc5c reset data storage if .init() is called. 2016-12-16 11:10:48 -05:00
Josh de Leeuw
d7d6d5b971 test addProperties 2016-12-16 11:05:47 -05:00
Josh de Leeuw
f125065451 fix ^ -> Math.pow() 2016-12-15 22:18:22 -05:00
Josh de Leeuw
7736561191 fix sd test 2016-12-15 22:14:45 -05:00
Josh de Leeuw
788ea0833b fix sqrt() 2016-12-15 22:08:43 -05:00
Josh de Leeuw
b4c63c607f more tests of datacollection 2016-12-15 22:06:56 -05:00
Josh de Leeuw
30a7401e92 missing .length 2016-12-15 21:59:29 -05:00
Josh de Leeuw
c8ff0ad884 bug 2016-12-15 21:56:56 -05:00
Josh de Leeuw
c1fbe542df datacollection tests 2016-12-15 21:53:52 -05:00
Josh de Leeuw
7806cd14e6 More changes to how data is handled... 2016-12-15 21:38:22 -05:00
Josh de Leeuw
22cc5bf878 DataCollection and DataColumn, breaks code for now. 2016-12-15 15:13:18 -05:00
Josh de Leeuw
f40c848543 year updates 2016-12-15 11:43:38 -05:00
Josh de Leeuw
41cd3e87a7 don't remove DOM element when adding progress bar! 2016-12-15 11:29:23 -05:00
Josh de Leeuw
b24f951f45 fix typo 2016-12-15 11:29:09 -05:00
Josh de Leeuw
698bba5fee modify examples 2016-12-15 11:10:13 -05:00
Josh de Leeuw
74acf2c7b1 fixes flexbox layout for IE11 2016-12-15 11:10:05 -05:00
Josh de Leeuw
22d46bcab8 better html5 audio fallback #311 2016-12-15 11:09:36 -05:00