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 |
|
Alain Pitiot
|
1a8653aa39
|
documentation for 2021.1.4
|
2021-04-09 13:59:44 +02:00 |
|
Alain Pitiot
|
328127979a
|
Merge branch 'master' of github.com:psychopy/psychojs
|
2021-04-09 13:57:42 +02:00 |
|
Alain Pitiot
|
4208fc5e9a
|
changed version number and copyright
|
2021-04-09 13:57:33 +02:00 |
|
Alain Pitiot
|
a1bcbfe2e2
|
Merge pull request #302 from thewhodidthis/bf#301--textbox
core/Keyboard: re-allow default behaviour on keydown
|
2021-04-09 13:57:15 +02:00 |
|
Sotiri Bakagiannis
|
599da154aa
|
core/Keyboard: re-allow default behaviour on keydown
|
2021-04-09 12:52:44 +01:00 |
|
Alain Pitiot
|
9183221e28
|
Merge branch 'master' of github.com:psychopy/psychojs
|
2021-04-09 13:44:55 +02:00 |
|
Alain Pitiot
|
9b9d4e335e
|
_
|
2021-04-09 13:44:26 +02:00 |
|
Alain Pitiot
|
8b1ee8afeb
|
Merge pull request #154 from thewhodidthis/nf#132--sound
sound/Sound: add setSound method
|
2021-04-09 13:20:33 +02:00 |
|
Alain Pitiot
|
bdcd4ac278
|
Merge pull request #203 from thewhodidthis/bf#202--opacity
visual/VisualStim: Enable pixi updates when setting opacity
|
2021-04-09 13:19:15 +02:00 |
|
Alain Pitiot
|
55b1789e2f
|
Merge pull request #281 from thewhodidthis/bf#280--forms
visual/Form: support the radio type, same as choice
|
2021-04-09 13:18:48 +02:00 |
|
Alain Pitiot
|
e9d6119a21
|
Merge pull request #292 from thewhodidthis/bf#291--set-image
visual/ImageStim: check if image attribute different before onChange() call
|
2021-04-09 13:17:59 +02:00 |
|
Alain Pitiot
|
45ae6d9a8a
|
Merge pull request #296 from thewhodidthis/nf#294--fades
sound/TrackPlayer: add fades on play / stop
|
2021-04-09 13:17:17 +02:00 |
|
Sotiri Bakagiannis
|
a00211478c
|
visual/MovieStim: drop set opacity attribute from constructor (no effect)
|
2021-04-08 16:11:10 +01:00 |
|
Sotiri Bakagiannis
|
fcac8d42bb
|
sound/TrackPlayer: fix typo, add JSDoc comments for fadeDuration
|
2021-03-29 17:01:57 +01:00 |
|
Sotiri Bakagiannis
|
e6a21d3cc3
|
sound/TrackPlayer: add fades on play / stop
|
2021-03-29 16:53:35 +01:00 |
|
Sotiri Bakagiannis
|
f19b46272e
|
visual/ImageStim: check against the 'src' attribute
|
2021-03-24 13:05:50 +00:00 |
|
Sotiri Bakagiannis
|
987244e9fb
|
Merge branch 'master' into bf#202--opacity
|
2021-03-19 06:56:06 +00:00 |
|
Sotiri Bakagiannis
|
5d202b7526
|
visual/ImageStim: check if image attribute different before onChange call
|
2021-03-18 18:09:57 +00:00 |
|
Sotiri Bakagiannis
|
872f5e71f1
|
Merge pull request #249 from thewhodidthis/bf#238--slider
visual/Slider: estimate bounding box at the top of update calls
|
2021-03-17 14:25:50 +00:00 |
|