HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity
844 Commits 51 Branches 0 Tags 15 MiB
main
Commit Graph

844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sotiri Bakagiannis
2202173bbc
Merge pull request #396 from thewhodidthis/bf#384--text-input 
visual/TextInput: upgrade to PIXI.TextInput latest, with patches applied
 2021-07-08 14:44:50 +01:00
Sotiri Bakagiannis
b1af859427 Merge branch 'main' into bf#384--text-input 2021-07-08 14:44:06 +01:00
Alain Pitiot
6211e606dd
Update package.json 2021-07-07 16:11:35 +02:00
Sotiri Bakagiannis
ebc128a2b6
Merge pull request #420 from thewhodidthis/bf#209+210--css 
core/GUI: clean up dialog pane sizing parts, use css
 2021-07-07 14:58:11 +01:00
Sotiri Bakagiannis
d9c5aac1c4
Merge pull request #426 from thewhodidthis/bf#425--clock 
core/ServerManager: do import Clock
 2021-07-07 14:43:15 +01:00
Sotiri Bakagiannis
966e7a5b39 core/ServerManager: do import Clock 2021-07-07 14:42:34 +01:00
Alain Pitiot
72baa6f64b
Merge pull request #423 from apitiot/master 
_
 2021-06-25 08:24:06 +02:00
Alain Pitiot
7e63f88aa4 _ 2021-06-25 08:23:09 +02:00
Alain Pitiot
d44919c75c
Merge pull request #422 from apitiot/master 
added more features to AudioClip and AudioClipPlayer
 2021-06-25 07:43:15 +02:00
Alain Pitiot
d8283885c5
Merge branch 'psychopy:main' into master 2021-06-25 07:39:31 +02:00
Alain Pitiot
89892ff545 Added more features to AudioClip and AudioClipPlayer; fixed import of JSON resource files 2021-06-25 07:38:21 +02:00
Sotiri Bakagiannis
9038281dc9 css: give dialogs a max width for screens < 500 2021-06-23 16:29:22 +01:00
Sotiri Bakagiannis
9f2c16f2a9 core/GUI: clean up dialog sizing extras 2021-06-23 16:28:24 +01:00
Sotiri Bakagiannis
ffb75f996c css: drop scaling of dialog boxes, clean up 2021-06-23 16:11:41 +01:00
Alain Pitiot
392c124054
Merge pull request #412 from thewhodidthis/bf#411--slider 
visual/Slider: bring style symbols inline with PsychoPy
 2021-06-23 09:19:03 +02:00
Sotiri Bakagiannis
9b1a0ed785
Merge pull request #418 from thewhodidthis/bf#416--minify 
scripts: tweak js minification options to leave identifiers as is
 2021-06-21 17:40:29 +01:00
tpronk
8b360a9947
BF: disable scheduled runs 2021-06-21 17:24:08 +01:00
Sotiri Bakagiannis
1dc3eabd0d scripts: tweak js minification options to leave identifiers as is 2021-06-21 16:57:44 +01:00
Alain Pitiot
f0d42a811e
Merge pull request #417 from apitiot/master 
fromSnapshot now creates a global variable for the trial
 2021-06-21 14:34:33 +02:00
Alain Pitiot
b9228bc65f fromSnapshot now creates a global variable for the trial, such that loop.thisTrial['field'] === thisLoop['field'] 2021-06-21 14:33:22 +02:00
Alain Pitiot
2a0d213c74
Merge pull request #415 from apitiot/master 
added AudioClip Player (minimal skeleton), minor fixes, updated documentation
 2021-06-21 07:40:31 +02:00
Alain Pitiot
d9c587b34e updated documentation; added jsdoc configuration file 2021-06-21 07:38:07 +02:00
Alain Pitiot
8b15ac5fcc try and keep the size of the licensee logo reasonable in the pop up experiment window 2021-06-21 07:08:53 +02:00
Alain Pitiot
2c3e571193 minor corrections to TrialHandler.setSeed 2021-06-21 07:06:22 +02:00
Alain Pitiot
fc80e8ade9 added skeleton of AudioClip Player 2021-06-18 16:55:34 +02:00
Sotiri Bakagiannis
2acbca7fd0 visual/Slider: bring style symbols inline with PsychoPy 2021-06-18 13:31:57 +01:00
Sotiri Bakagiannis
b8956f5c4f
Merge pull request #394 from thewhodidthis/bf#322--slider 
Do support Form.Types.SLIDER
 2021-06-16 16:11:54 +01:00
Alain Pitiot
9cecf2984f
Merge pull request #406 from thewhodidthis/bf#404--textbox 
visual/TextBox: add clear method, tweak reset to take editable into account
 2021-06-15 19:28:34 +02:00
Alain Pitiot
f4000ca0ee
Merge pull request #405 from thewhodidthis/bf#401--slider 
visual/Slider: add lineColor option, borderColor alias
 2021-06-15 19:26:07 +02:00
Sotiri Bakagiannis
25a49771e5 visual/TextBox: add clear method, tweak reset to take editable into account 2021-06-15 17:13:19 +01:00
Sotiri Bakagiannis
c41554c1ef visual/Slider: add lineColor option, borderColor alias 2021-06-15 16:24:00 +01:00
Thomas Pronk
3c807ec363 RF: Could not get this action to work quickly enough 2021-06-15 15:44:38 +01:00
Thomas Pronk
dfbfca8d47 BF: fix name of workflow 2021-06-15 15:31:03 +01:00
Thomas Pronk
abcc11adf5 BF: remove skipping library building 2021-06-15 15:29:36 +01:00
Thomas Pronk
dd338892d1 ENH: A quick attempt at compiling and deploying a test-experiment via GH actions 
This is so that the PsychoPy team can test the code generation independently
 2021-06-15 15:28:50 +01:00
Alain Pitiot
9ced77d1ec
Merge pull request #403 from apitiot/master 
getSnapshot / fromSnapshot now also store/restore TrialHandler's trial attributes
 2021-06-15 16:17:51 +02:00
Alain Pitiot
7a9cdcfd27 Merge branch 'psychopy:main' into master 2021-06-15 16:15:46 +02:00
Alain Pitiot
56fbb0e29d Merge branch 'master' of github.com:apitiot/psychojs 2021-06-15 16:11:45 +02:00
Alain Pitiot
198becd71e getSnapshot / fromSnapshot now also store/restore the trial attributes 2021-06-15 16:11:33 +02:00
Alain Pitiot
6cd6135ce7
Merge pull request #402 from thewhodidthis/bf#395--text-input 
visual/TextBox/TextInput: only disable text substitution when multiline
 2021-06-15 15:35:25 +02:00
Sotiri Bakagiannis
e868f941f9 visual/TextInput: access a text value, only disable text substitution when multiline 2021-06-15 14:33:07 +01:00
Sotiri Bakagiannis
d3e3a67a80 visual/TextBox: pass text value on to text input 2021-06-15 14:32:23 +01:00
Alain Pitiot
71f1576e84
Merge pull request #352 from thewhodidthis/bf#348--no-moment 
util/Clock: drop moment and the format argument from getDateStr()
 2021-06-15 14:49:18 +02:00
Alain Pitiot
6ecb96b561
Merge branch 'main' into bf#348--no-moment 2021-06-15 14:49:10 +02:00
Alain Pitiot
0a2ce3d167
Merge pull request #400 from apitiot/master 
change the Microphone API to be consistent with the other Stimuli, i.e. passing Window instead of PsychoJS; handled transcription error in AudioClip
 2021-06-15 11:17:23 +02:00
Alain Pitiot
87d6d7fde6 Merge branch 'psychopy:main' into master 2021-06-15 11:16:08 +02:00
Alain Pitiot
3d9eb73840 changed the API of Microphone to be consistent with the other Stimuli, i.e. passing Window instead of PsychoJS; handled transcription error in AudioClip 2021-06-15 11:15:50 +02:00
Sotiri Bakagiannis
29795025b9 visual/TextInput: upgrade to PIXI.TextInput latest, with patches applied 2021-06-14 21:06:52 +01:00
Sotiri Bakagiannis
77cdfa9646 visual/Form: clean up slider options merging 2021-06-11 20:57:51 +01:00
Sotiri Bakagiannis
f372162553 visual/Form: add granularity per item override 2021-06-11 20:45:53 +01:00