HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-11 16:18:10 +00:00
Code Actions Packages Releases Activity
356 Commits 51 Branches 0 Tags 15 MiB
2303fffa3f
Commit Graph

356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tpronk
2303fffa3f
BF: Trivial change to trigger GitHub to rebuild the pages 2021-05-24 13:03:26 +01:00
Jon Peirce
f44ba55291
Merge pull request #351 from thewhodidthis/bf#347--no-master 
DOCS: update contributing guide to reflect default branch is now main
 2021-05-24 13:01:40 +01:00
Sotiri Bakagiannis
ba8a974fd4 DOCS: update contributing guide to reflect default branch is now main 2021-05-24 10:12:47 +01:00
Sotiri Bakagiannis
1987c26b93
Merge pull request #350 from tpronk/add_CONTIBUTING 
DOCS: Add contributing guide
 2021-05-21 11:48:14 +01:00
Thomas Pronk
e44e3ea569 DOCS: Contribution guide 2021-05-21 11:30:25 +01:00
tpronk
9b5adc8522
Update package.json 2021-05-19 15:39:52 +01:00
tpronk
843e8eec79
Update package.json 2021-05-19 15:29:36 +01:00
Sotiri Bakagiannis
284542c114
Merge pull request #344 from tpronk/testrun_badges 
DOCS: Add testrun badges to README
 2021-05-18 13:52:38 +01:00
tpronk
3efb310faf
Update node to v14 2021-05-18 13:08:48 +01:00
tpronk
5ce13c95d2
Add testrun badges to README 2021-05-18 00:17:53 +01:00
tpronk
733526ae63
Update Automated Test (short).yml 2021-05-17 20:36:44 +01:00
tpronk
d1ce5a17fc
Update and rename test_thorough.yml to Automated Test (full).yml 2021-05-17 20:36:25 +01:00
tpronk
32869b9924
Rename to "fast" to "short" 2021-05-17 20:34:46 +01:00
tpronk
cb64593af0
Update test_thorough.yml 2021-05-17 18:33:23 +01:00
tpronk
e5539399f2
Update default label to "fast" 2021-05-17 17:55:24 +01:00
Sotiri Bakagiannis
26e44b147f
Merge pull request #337 from peircej/master 
DOCS: Add Code Covenant and update the readme
 2021-05-17 15:16:31 +01:00
Jon Peirce
7f4899ed5e DOCS: better wording regarding generating PsychoJS from Builder 2021-05-17 14:25:19 +01:00
Jon Peirce
b8fd62f68d DOCS: move the Code Covenant badge to the top of page 2021-05-17 14:20:07 +01:00
Jon Peirce
22c082cca7 DOCS: readme updated and code of conduct added 2021-05-17 14:18:24 +01:00
Alain Pitiot
0121eeab1d
Merge pull request #320 from thewhodidthis/bf#290--bom 
data/ExperimentHandler: prepend BOM when exporting CSV
 2021-05-16 16:51:17 +02:00
Alain Pitiot
1ee86be4f8
Merge pull request #327 from thewhodidthis/nf#316--button 
Implement ButtonStim class
 2021-05-16 16:48:12 +02:00
Sotiri Bakagiannis
52b53376d8 visual/ButtonStim: make sure isClicked tracks left mouse button presses only 2021-05-10 16:14:09 +01:00
tpronk
2dd1d599e2
Let's see if it runs this evening 2021-05-10 15:39:41 +01:00
tpronk
b0d7701878
ENH: Changed CRON time for a test 2021-05-10 15:24:38 +01:00
Sotiri Bakagiannis
335f7dfece visual/TextBox: import ButtonStim class 2021-05-10 14:33:37 +01:00
Sotiri Bakagiannis
6e5f63baff visual/ButtonStim: fix class name 2021-05-10 14:33:08 +01:00
tpronk
d475a02479
Create test_thorough.yml 2021-05-10 14:31:12 +01:00
tpronk
0701354f15
BF: path issues 2021-05-10 14:27:12 +01:00
tpronk
43b36a95d1
BF: Fix typo 2021-05-10 14:24:05 +01:00
tpronk
45a2bb1938
Create test_fast.yml 2021-05-10 14:22:38 +01:00
Sotiri Bakagiannis
6e1befa8c6 visual: export ButtonStim 2021-05-10 14:04:46 +01:00
Sotiri Bakagiannis
61e41553d3 visual/TextBox+TextInput: skip event listeners for ButtonStim 2021-05-10 14:04:32 +01:00
Sotiri Bakagiannis
05eb0aabf0 visual/ButtonStim: translate over from PsychoPy 2021-05-10 13:52:40 +01:00
Sotiri Bakagiannis
2d299c7730
Merge pull request #326 from RebeccaHirst/_addformComplete 
add formComplete method (code cleanup)
 2021-05-10 11:58:19 +01:00
RebeccaHirst
cfc2debcf6 cleanup formcomplete 2021-05-10 11:18:18 +01:00
Alain Pitiot
f1e4e5b5b9
Merge pull request #317 from tpronk/master 
ENH: some changes in support of automated testing (and one for easier committing)
 2021-05-10 08:10:27 +02:00
Rebecca Hirst
ea3501405b Merge branch 'psychopy:master' into master 2021-05-07 23:52:15 +01:00
Rebecca Hirst
bdc3915b23
Update Form.js 2021-05-07 23:29:56 +01:00
Sotiri Bakagiannis
98a5de434f data/ExperimentHandler: tweak for XLSX not prepending BOM when converting to csv 2021-05-07 14:33:03 +01:00
Thomas Pronk
54e21ff90e package-lock needed to cache dependencies in GitHub Workflows 2021-04-29 17:09:32 +01:00
Thomas Pronk
9c28f51817 Write captured errors to body.data-report attribute 2021-04-29 15:29:46 +01:00
Thomas Pronk
5a12d3210c Ignore node_modules directory 2021-04-29 15:21:55 +01:00
Thomas Pronk
d92d8757fe Prefix cross-var with npx, so it runs in GitHub Workflows 2021-04-29 15:21:38 +01:00
Alain Pitiot
980519c84c
Merge pull request #305 from thewhodidthis/nf#304--eslint 
Switch to ESlint
 2021-04-21 06:00:14 +02:00
Thomas Pronk
7f527e0f5c Add cross-var dependency and prefix build:cc with cross-var 
This fixes the $npm_package_version variable on Windows CMD. See: https://stackoverflow.com/a/48619640
 2021-04-19 19:54:12 +01:00
RebeccaHirst
99247a8f13 remove complete as method 2021-04-19 12:57:27 +01:00
RebeccaHirst
d5006a0c9a add doc to complete 2021-04-19 11:52:34 +01:00
RebeccaHirst
3e637bd0bb Merge branch 'master' of https://github.com/RebeccaHirst/psychojs 2021-04-19 11:50:39 +01:00
RebeccaHirst
823eeb07aa add complete and fromComplete methods to Form 2021-04-19 11:50:33 +01:00
Rebecca Hirst
9116a4a2d0
Merge pull request #1 from psychopy/master 
merge from upstream
 2021-04-19 11:44:11 +01:00