HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-12 08:38:10 +00:00
Code Actions Packages Releases Activity
753 Commits 51 Branches 0 Tags 15 MiB
2bad0b34f1
Commit Graph

260 Commits

Author SHA1 Message Date
Sotiri Bakagiannis
bf4fe0b3db sound: drop Transcriber export for now 2021-06-01 17:44:55 +01:00
Alain Pitiot
9e10fa489a _ 2021-06-01 13:35:51 +02:00
Alain Pitiot
823834d904 _ 2021-06-01 13:32:21 +02:00
Alain Pitiot
ba8d6f5092 _ 2021-06-01 13:28:36 +02:00
Alain Pitiot
0bac3ee235 Merge branch 'master' of github.com:apitiot/psychojs 2021-06-01 11:04:53 +02:00
Alain Pitiot
7ebca99430 _ 2021-06-01 11:04:48 +02:00
Alain Pitiot
27ffab0447 Merge branch 'psychopy:main' into master 2021-06-01 11:03:50 +02:00
Alain Pitiot
ef08c44c02 added missing docs 2021-05-31 13:49:13 +02:00
Alain Pitiot
4cf0367468
Merge branch 'main' into bf#334--font 2021-05-31 13:04:09 +02:00
Alain Pitiot
f9df73b4fe Merge branch 'main' into bf#334--font 2021-05-31 13:04:09 +02:00
Alain Pitiot
e4aec61fcd
Merge pull request #354 from thewhodidthis/bf#300-gui 
core/GUI: restore warning about required fields
 2021-05-31 13:00:06 +02:00
Alain Pitiot
b0a97cf3e6 Merge pull request #354 from thewhodidthis/bf#300-gui 
core/GUI: restore warning about required fields
 2021-05-31 13:00:06 +02:00
Alain Pitiot
f5b06bff0b
Merge pull request #340 from tpronk/textbox_stay_on_resize 
BF: Retain entered text (and placeholder) upon resize
 2021-05-31 12:46:19 +02:00
Alain Pitiot
04b21a4274 Merge pull request #340 from tpronk/textbox_stay_on_resize 
BF: Retain entered text (and placeholder) upon resize
 2021-05-31 12:46:19 +02:00
Alain Pitiot
56655a1d85
Merge branch 'main' into nf#335--deps 2021-05-31 11:59:19 +02:00
Alain Pitiot
811c7fee11 Merge branch 'main' into nf#335--deps 2021-05-31 11:59:19 +02:00
Alain Pitiot
721b88631a _ 2021-05-31 09:25:09 +02:00
Alain Pitiot
023940735b
Merge branch 'master' into main 2021-05-31 08:47:47 +02:00
Alain Pitiot
54e57c46c1 Merge branch 'master' into main 2021-05-31 08:47:47 +02:00
Alain Pitiot
0873570bae Merge branch 'master' into main 2021-05-31 08:47:47 +02:00
Alain Pitiot
aad2753a0b _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
f155192fd5 _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
60cfc55627 _ 2021-05-31 08:32:35 +02:00
Sotiri Bakagiannis
dc068df9a0 src/*: use imports for deps 2021-05-27 19:21:03 +01:00
Sotiri Bakagiannis
191ca3458e core/GUI: restore warning about required fields 2021-05-27 11:17:28 +01:00
Sotiri Bakagiannis
43be6cad04 util/Clock: fix JSDoc 2021-05-25 13:12:14 +01:00
Sotiri Bakagiannis
78b4466c6a util/Clock: drop the ISO part in favour of session specific timestamps 2021-05-25 12:18:29 +01:00
Sotiri Bakagiannis
e35113da7d Merge branch 'main' into bf#348--no-moment 2021-05-25 11:32:18 +01:00
Alain Pitiot
fbd30ab2db
Merge pull request #345 from thewhodidthis/bf#339--trial-handler 
data/TrialHandler: allow for calling next() like PsychoPy
 2021-05-25 11:04:17 +02:00
Alain Pitiot
f23b696814
Merge pull request #349 from thewhodidthis/bf#346--sound 
sound/TrackPlayer: drop extra play / seek calls
 2021-05-25 10:39:16 +02:00
Sotiri Bakagiannis
ee1edfa99c data/TrialHandler: drop the getter on trialIterator 2021-05-25 09:35:55 +01:00
Alain Pitiot
37c4e2d9de
Merge pull request #333 from thewhodidthis/nf#315--form 
visual/Slider/Form/TextBox: towards implementing five color model
 2021-05-25 10:27:22 +02:00
Sotiri Bakagiannis
ec17ceb303 util/Clock: drop moment and the format argument from getDateStr() 2021-05-24 13:16:56 +01:00
Sotiri Bakagiannis
61ea059cd5 sound/TrackPlayer: drop extra play / seek calls 2021-05-21 07:44:53 +01:00
Sotiri Bakagiannis
91f5c86adc data/TrialHandler: add next method, trialIterator getter 2021-05-19 17:18:47 +01:00
Thomas Pronk
de2b210e99 Retain entered text (and placeholder) upon resize 2021-05-17 23:10:47 +01:00
Sotiri Bakagiannis
864eab588a visual/Slider: clean up JSDoc for font, use Arial by default 2021-05-17 14:26:06 +01:00
Sotiri Bakagiannis
4cc9630610 visual/Form: support font property 2021-05-17 14:22:22 +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
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
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
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
9c28f51817 Write captured errors to body.data-report attribute 2021-04-29 15:29:46 +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
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
3adfe76621 git: move stylesheet into src dir 2021-04-15 13:48:11 +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