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
395 Commits 51 Branches 0 Tags 15 MiB
eb277adaee
Commit Graph

395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alain Pitiot
eb277adaee _ 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
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
f9df73b4fe 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
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
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
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
721b88631a _ 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
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
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
f155192fd5 _ 2021-05-31 08:32:35 +02:00
Alain Pitiot
60cfc55627 _ 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
Sotiri Bakagiannis
191ca3458e core/GUI: restore warning about required fields 2021-05-27 11:17:28 +01:00
Alain Pitiot
020978f4f0
Update README.md 2021-05-25 14:33:37 +02:00
Alain Pitiot
21d39e8d46
Update README.md 2021-05-25 14:32:38 +02: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
tpronk
2303fffa3f
BF: Trivial change to trigger GitHub to rebuild the pages 2021-05-24 13:03:26 +01:00
Jon Peirce
f44ba55291
Merge pull request #351 from thewhodidthis/bf#347--no-master 
DOCS: update contributing guide to reflect default branch is now main
 2021-05-24 13:01:40 +01:00
Sotiri Bakagiannis
ba8a974fd4 DOCS: update contributing guide to reflect default branch is now main 2021-05-24 10:12:47 +01:00
Sotiri Bakagiannis
1987c26b93
Merge pull request #350 from tpronk/add_CONTIBUTING 
DOCS: Add contributing guide
 2021-05-21 11:48:14 +01:00
Thomas Pronk
e44e3ea569 DOCS: Contribution guide 2021-05-21 11:30:25 +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
tpronk
9b5adc8522
Update package.json 2021-05-19 15:39:52 +01:00
tpronk
843e8eec79
Update package.json 2021-05-19 15:29:36 +01:00
Sotiri Bakagiannis
284542c114
Merge pull request #344 from tpronk/testrun_badges 
DOCS: Add testrun badges to README
 2021-05-18 13:52:38 +01:00
tpronk
3efb310faf
Update node to v14 2021-05-18 13:08:48 +01:00
tpronk
5ce13c95d2
Add testrun badges to README 2021-05-18 00:17:53 +01:00
Thomas Pronk
de2b210e99 Retain entered text (and placeholder) upon resize 2021-05-17 23:10:47 +01:00
tpronk
733526ae63
Update Automated Test (short).yml 2021-05-17 20:36:44 +01:00
tpronk
d1ce5a17fc
Update and rename test_thorough.yml to Automated Test (full).yml 2021-05-17 20:36:25 +01:00
tpronk
32869b9924
Rename to "fast" to "short" 2021-05-17 20:34:46 +01:00
tpronk
cb64593af0
Update test_thorough.yml 2021-05-17 18:33:23 +01:00
tpronk
e5539399f2
Update default label to "fast" 2021-05-17 17:55:24 +01:00
Sotiri Bakagiannis
26e44b147f
Merge pull request #337 from peircej/master 
DOCS: Add Code Covenant and update the readme
 2021-05-17 15:16:31 +01:00