1
0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-11 16:18:10 +00:00
Commit Graph

844 Commits

Author SHA1 Message Date
Jon Peirce
7f4899ed5e DOCS: better wording regarding generating PsychoJS from Builder 2021-05-17 14:25:19 +01:00
Sotiri Bakagiannis
4cc9630610 visual/Form: support font property 2021-05-17 14:22:22 +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
0cafac1689 visual/Slider/Form/TextBox: towards implementing five color model 2021-05-14 20:59:30 +01: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
8ea6aee1b4 Merge branch 'master' of github.com:psychopy/psychojs 2021-04-27 08:20:44 +02:00
Alain Pitiot
73cb6f6e40 _ 2021-04-27 08:20:15 +02: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
Sotiri Bakagiannis
8721b064eb git/package: add eslint config 2021-04-16 09:30:09 +01:00
Sotiri Bakagiannis
dd0d63663f package: bring in eslint to replace jshint 2021-04-16 09:29:54 +01:00
Alain Pitiot
5f4496ebdf
Merge pull request #303 from thewhodidthis/nf#174--repackaging
Bring packaging up to date with master latest
2021-04-15 17:31:25 +02:00
Sotiri Bakagiannis
8f0510dfda package: up version 2021-04-15 14:03:47 +01:00
Sotiri Bakagiannis
752337184a core/Window: fix import paths for rollup 2021-04-15 13:59:56 +01:00
Sotiri Bakagiannis
678712b26e css: clean up 2021-04-15 13:49:20 +01:00
Sotiri Bakagiannis
d03d1be59f editorconfig: use spaces for css 2021-04-15 13:49:08 +01:00
Sotiri Bakagiannis
3adfe76621 git: move stylesheet into src dir 2021-04-15 13:48:11 +01:00
Sotiri Bakagiannis
5cc32f2f50 git: ignore dist dir 2021-04-15 13:47:22 +01:00
Sotiri Bakagiannis
3587c689e8 git: add package.json, rollup build script 2021-04-15 13:46:44 +01:00
Sotiri Bakagiannis
e1df2bc19c js/src: add index files to re-export components from each module folder 2021-04-15 13:45:13 +01:00
Sotiri Bakagiannis
bcbf62e724 git: rename js folder to src 2021-04-15 13:39:02 +01:00