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
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
9e09356e19 Merge branch 'main' into bf#348--no-moment 2021-06-03 09:49:14 +01:00
Sotiri Bakagiannis
cfbfc16f7e scripts: add sourcemap option for esbuild 2021-06-03 09:36:30 +01:00
Alain Pitiot
33736657b9
Merge pull request #361 from psychopy/nf#360--iife 
scripts/js: add an iife outfile with PsychoJS global
 2021-06-02 19:43:26 +02:00
Sotiri Bakagiannis
3508a16322 scripts: clean up 2021-06-02 18:36:57 +01:00
Sotiri Bakagiannis
3fe9c9cb2c scripts/js: add an iife outfile with PsychoJS global 2021-06-02 18:11:01 +01:00
Sotiri Bakagiannis
5b202eb396 Merge branch 'main' into bf#348--no-moment 2021-06-02 13:51:28 +01:00
Alain Pitiot
d495dd95fa
Merge pull request #342 from tpronk/improve_error_logging 
ENH: Improve logging (of errors thrown by PsychoJS)
 2021-06-02 14:27:11 +02:00
Alain Pitiot
f5ac7d7789
Merge pull request #358 from thewhodidthis/bf#357-bundling 
Post esbuild migration clean up
 2021-06-02 14:21:07 +02:00
Sotiri Bakagiannis
7d3a264818 data: comment out the Shelf 2021-06-02 13:20:08 +01:00
Sotiri Bakagiannis
3ce93c9642 Merge branch 'main' into bf#357-bundling 2021-06-02 13:12:18 +01:00
Alain Pitiot
8bd1030afa
Merge pull request #359 from apitiot/master 
various updates
 2021-06-02 13:56:44 +02:00
Alain Pitiot
725e5ca28f updated version number 2021-06-02 13:53:50 +02:00
Thomas Pronk
01491ef99b BF: re-added console.error on error 2021-06-02 10:39:24 +01:00
Sotiri Bakagiannis
f46b9fee2d scripts/css: clean up imports 2021-06-01 17:59:08 +01:00
Sotiri Bakagiannis
15b6688f3e scripts: separate out legal notices, add banner, clean up imports 2021-06-01 17:58:49 +01:00
Sotiri Bakagiannis
6c5d7750d7 package: add json extension to exports field 2021-06-01 17:58:25 +01:00
Sotiri Bakagiannis
6354cd95f6 editorconfig: use tabs with .cjs files 2021-06-01 17:47:01 +01:00
Sotiri Bakagiannis
f331432033 package: update lockfile version to match x 2021-06-01 17:46:45 +01:00
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
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
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
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
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
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
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
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
8badaf7ade _ 2021-05-31 09:29:15 +02:00
Alain Pitiot
4daf5eb1b9 _ 2021-05-31 09:29:15 +02:00