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
421 Commits 51 Branches 0 Tags 15 MiB
725e5ca28f
Commit Graph

421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alain Pitiot
725e5ca28f updated version number 2021-06-02 13:53:50 +02:00
Alain Pitiot
9e10fa489a _ 2021-06-01 13:35:51 +02:00
Alain Pitiot
abc2c1a5d6 Merge branch 'master' of github.com:apitiot/psychojs 2021-06-01 13:35:17 +02:00
Alain Pitiot
ad7f192657 _ 2021-06-01 13:34:51 +02:00
Alain Pitiot
4c06c145eb Merge branch 'master' of github.com:apitiot/psychojs 2021-06-01 13:34:07 +02:00
Alain Pitiot
d2289a6b88 Merge branch 'master' of github.com:apitiot/psychojs 2021-06-01 13:34:07 +02:00
Alain Pitiot
823834d904 _ 2021-06-01 13:32:21 +02:00
Alain Pitiot
d6e79f62e2 _ 2021-06-01 13:32:21 +02:00
Alain Pitiot
eb277adaee _ 2021-06-01 13:32:21 +02:00
Alain Pitiot
ba8d6f5092 _ 2021-06-01 13:28:36 +02:00
Alain Pitiot
868a8e7dce _ 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
b834b68a3d 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
1c8bfcf4b4 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
80f1cccde8 added missing docs 2021-05-31 13:49:13 +02:00
Alain Pitiot
9249ad5040 Merge pull request #338 from thewhodidthis/bf#334--font 
visual/Form/Slider: clean up font family handling
 2021-05-31 13:04:16 +02:00
Alain Pitiot
f9b9620dca
Merge pull request #338 from thewhodidthis/bf#334--font 
visual/Form/Slider: clean up font family handling
 2021-05-31 13:04:16 +02:00
Alain Pitiot
f9df73b4fe Merge branch 'main' into bf#334--font 2021-05-31 13:04:09 +02:00
Alain Pitiot
4cf0367468
Merge branch 'main' into bf#334--font 2021-05-31 13:04:09 +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
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
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
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
994bc98a96 Merge pull request #355 from thewhodidthis/nf#335--deps 
Declare dependencies in package.json, use imports and esbuild for bundling JS/CSS
 2021-05-31 11:59:25 +02:00
Alain Pitiot
f4d17f0020
Merge pull request #355 from thewhodidthis/nf#335--deps 
Declare dependencies in package.json, use imports and esbuild for bundling JS/CSS
 2021-05-31 11:59:25 +02:00
Alain Pitiot
811c7fee11 Merge branch 'main' into nf#335--deps 2021-05-31 11:59:19 +02:00
Alain Pitiot
56655a1d85
Merge branch 'main' into nf#335--deps 2021-05-31 11:59:19 +02:00
Alain Pitiot
8badaf7ade _ 2021-05-31 09:29:15 +02:00
Alain Pitiot
4daf5eb1b9 _ 2021-05-31 09:29:15 +02:00
Alain Pitiot
721b88631a _ 2021-05-31 09:25:09 +02:00
Alain Pitiot
be9ff63996 _ 2021-05-31 09:25:09 +02:00
Alain Pitiot
311ffa5a10 Merge pull request #1 from psychopy/main 
fetch from upstream, incorporate recent Sotiri changes
 2021-05-31 08:48:29 +02:00
Alain Pitiot
d07108d86d
Merge pull request #1 from psychopy/main 
fetch from upstream, incorporate recent Sotiri changes
 2021-05-31 08:48:29 +02:00
Alain Pitiot
3130773b94 Merge pull request #1 from psychopy/main 
fetch from upstream, incorporate recent Sotiri changes
 2021-05-31 08:48:29 +02:00
Alain Pitiot
0215d01c54 Merge pull request #1 from psychopy/main 
fetch from upstream, incorporate recent Sotiri changes
 2021-05-31 08:48:29 +02:00
Alain Pitiot
54e57c46c1 Merge branch 'master' into main 2021-05-31 08:47:47 +02:00
Alain Pitiot
023940735b
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
9bf3eb7d82 Merge branch 'master' into main 2021-05-31 08:47:47 +02:00
Alain Pitiot
f155192fd5 _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
aad2753a0b _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
60cfc55627 _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
4f5a9e7e81 _ 2021-05-31 08:32:35 +02:00
Sotiri Bakagiannis
ba90bb0ef5 scripts: use psychojs prefix for now 2021-05-27 20:08:28 +01:00
Sotiri Bakagiannis
dc068df9a0 src/*: use imports for deps 2021-05-27 19:21:03 +01:00
Sotiri Bakagiannis
a92781c364 git: ignore out folder 2021-05-27 19:18:13 +01:00
Sotiri Bakagiannis
2a2b5d4e2e git/package: add and upgrade engines and deps, use esbuild custom scripts 2021-05-27 19:18:03 +01:00