Commit Graph

Select branches

Hide Pull Requests

2020.1

2020.2

2021.1.0

2021.2.0

2021.2.1

2021.2.2

2021.2.3

2021.3.0

2022.1.0

2022.1.1

2022.1.2

2022.1.3

2022.2.0

2022.2.3

2022.2.4

2022.2.5

2022.3.0

2022.x

2023.1.0

2023.1.1

2023.1.2

2023.1.3

2023.2

2023.2.0

2023.2.1

2023.2.2

2023.2.3

2023.2.4

2024.1.0

2024.2.0

2024.2.x

3.1.4

3.1.5

CU-2j4rb2p_gif_support

CU-862j0cfkw_iphone_video_fix

background_image_support_for_psychojswindow

button_improvements

dependabot/npm_and_yarn/ansi-regex-5.0.1

dependabot/npm_and_yarn/glob-parent-5.1.2

dependabot/npm_and_yarn/markdown-it-and-jsdoc-12.3.2

dependabot/npm_and_yarn/marked-and-jsdoc-4.2.4

dependabot/npm_and_yarn/minimatch-3.1.2

dotstim

imagestim_missing_size_dimension_handling

iphone_video

main

multitouch

next

psychojs_window_bg_image

update_github_actions

youtube_support_for_moviestim

#10

#100

#102

#103

#105

#107

#109

#11

#110

#112

#119

#122

#125

#127

#129

#135

#137

#141

#143

#145

#146

#147

#149

#151

#152

#154

#156

#158

#162

#163

#164

#166

#177

#178

#180

#181

#188

#192

#194

#201

#203

#204

#207

#208

#212

#216

#221

#223

#229

#232

#236

#240

#243

#245

#247

#248

#248

#249

#250

#251

#252

#254

#255

#258

#258

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#271

#274

#276

#277

#278

#281

#282

#285

#292

#296

#302

#303

#305

#307

#308

#309

#317

#320

#324

#325

#326

#327

#330

#332

#333

#337

#338

#340

#342

#344

#345

#349

#350

#351

#352

#353

#354

#355

#358

#359

#361

#363

#365

#368

#372

#375

#376

#376

#378

#381

#382

#385

#387

#389

#390

#391

#392

#393

#394

#396

#398

#398

#399

#399

#400

#402

#403

#405

#406

#412

#414

#415

#417

#418

#420

#422

#423

#424

#424

#426

#428

#429

#430

#431

#432

#434

#434

#437

#441

#442

#443

#445

#446

#45

#453

#455

#457

#458

#46

#466

#467

#468

#47

#470

#472

#473

#474

#475

#478

#479

#481

#482

#483

#484

#485

#485

#486

#486

#487

#488

#489

#490

#491

#492

#493

#494

#496

#497

#498

#499

#500

#501

#502

#503

#503

#504

#505

#506

#507

#508

#509

#510

#511

#511

#512

#513

#514

#515

#516

#517

#518

#519

#520

#521

#522

#523

#524

#525

#527

#527

#528

#529

#530

#531

#532

#533

#534

#535

#535

#536

#537

#539

#539

#540

#540

#541

#542

#543

#544

#545

#545

#546

#546

#547

#548

#549

#550

#551

#552

#553

#554

#555

#556

#558

#559

#562

#566

#566

#567

#568

#569

#570

#573

#574

#575

#576

#577

#578

#579

#580

#581

#581

#582

#583

#586

#588

#589

#589

#591

#592

#592

#593

#594

#595

#596

#596

#597

#597

#598

#599

#60

#600

#601

#602

#602

#604

#604

#607

#607

#608

#609

#609

#62

#7

#8

#8

#86

#9

#90

#93

#95

#99

Mono Color

• 89892ff545 Added more features to AudioClip and AudioClipPlayer; fixed import of JSON resource files Alain Pitiot 2021-06-25 07:38:21 +0200
• 9038281dc9 css: give dialogs a max width for screens < 500 #420 Sotiri Bakagiannis 2021-06-23 16:29:22 +0100
• 9f2c16f2a9 core/GUI: clean up dialog sizing extras Sotiri Bakagiannis 2021-06-23 16:28:17 +0100
• ffb75f996c css: drop scaling of dialog boxes, clean up Sotiri Bakagiannis 2021-06-23 16:11:37 +0100
• 353c6f362c
  Merge a6df4c4fb9 into 392c124054 #376 tpronk 2021-06-23 09:06:03 +0100
• 392c124054
  Merge pull request #412 from thewhodidthis/bf#411--slider Alain Pitiot 2021-06-23 09:19:03 +0200
• 9b1a0ed785
  Merge pull request #418 from thewhodidthis/bf#416--minify Sotiri Bakagiannis 2021-06-21 17:40:29 +0100
• 8b360a9947
  BF: disable scheduled runs tpronk 2021-06-21 17:24:08 +0100
• 1dc3eabd0d scripts: tweak js minification options to leave identifiers as is #418 Sotiri Bakagiannis 2021-06-21 16:57:44 +0100
• f0d42a811e
  Merge pull request #417 from apitiot/master Alain Pitiot 2021-06-21 14:34:33 +0200
• b9228bc65f fromSnapshot now creates a global variable for the trial, such that loop.thisTrial['field'] === thisLoop['field'] #417 Alain Pitiot 2021-06-21 14:33:22 +0200
• 2a0d213c74
  Merge pull request #415 from apitiot/master Alain Pitiot 2021-06-21 07:40:31 +0200
• d9c587b34e updated documentation; added jsdoc configuration file #415 Alain Pitiot 2021-06-21 07:38:07 +0200
• 8b15ac5fcc try and keep the size of the licensee logo reasonable in the pop up experiment window Alain Pitiot 2021-06-21 07:08:53 +0200
• 2c3e571193 minor corrections to TrialHandler.setSeed Alain Pitiot 2021-06-21 07:06:22 +0200
• c54481fd8c BF: handle scenarios where a loop does not have a conditions file #414 Thomas Pronk 2021-06-19 23:18:24 +0100
• fc80e8ade9 added skeleton of AudioClip Player Alain Pitiot 2021-06-18 16:55:34 +0200
• 2acbca7fd0 visual/Slider: bring style symbols inline with PsychoPy #412 Sotiri Bakagiannis 2021-06-18 13:31:49 +0100
• b8956f5c4f
  Merge pull request #394 from thewhodidthis/bf#322--slider Sotiri Bakagiannis 2021-06-16 16:11:54 +0100
• 9cecf2984f
  Merge pull request #406 from thewhodidthis/bf#404--textbox Alain Pitiot 2021-06-15 19:28:34 +0200
• f4000ca0ee
  Merge pull request #405 from thewhodidthis/bf#401--slider Alain Pitiot 2021-06-15 19:26:07 +0200
• 25a49771e5 visual/TextBox: add clear method, tweak reset to take editable into account #406 Sotiri Bakagiannis 2021-06-15 17:13:19 +0100
• c41554c1ef visual/Slider: add lineColor option, borderColor alias #405 Sotiri Bakagiannis 2021-06-15 16:24:00 +0100
• 3c807ec363 RF: Could not get this action to work quickly enough Thomas Pronk 2021-06-15 15:44:38 +0100
• dfbfca8d47 BF: fix name of workflow Thomas Pronk 2021-06-15 15:31:03 +0100
• abcc11adf5 BF: remove skipping library building Thomas Pronk 2021-06-15 15:29:36 +0100
• dd338892d1 ENH: A quick attempt at compiling and deploying a test-experiment via GH actions Thomas Pronk 2021-06-15 15:28:50 +0100
• 9ced77d1ec
  Merge pull request #403 from apitiot/master Alain Pitiot 2021-06-15 16:17:51 +0200
• 7a9cdcfd27 Merge branch 'psychopy:main' into master #403 Alain Pitiot 2021-06-15 16:15:46 +0200
• 56fbb0e29d Merge branch 'master' of github.com:apitiot/psychojs Alain Pitiot 2021-06-15 16:11:45 +0200
• 198becd71e getSnapshot / fromSnapshot now also store/restore the trial attributes Alain Pitiot 2021-06-15 16:11:33 +0200
• 6cd6135ce7
  Merge pull request #402 from thewhodidthis/bf#395--text-input Alain Pitiot 2021-06-15 15:35:25 +0200
• e868f941f9 visual/TextInput: access a text value, only disable text substitution when multiline #402 Sotiri Bakagiannis 2021-06-15 14:33:07 +0100
• d3e3a67a80 visual/TextBox: pass text value on to text input Sotiri Bakagiannis 2021-06-15 14:32:23 +0100
• 71f1576e84
  Merge pull request #352 from thewhodidthis/bf#348--no-moment Alain Pitiot 2021-06-15 14:49:18 +0200
• 6ecb96b561
  Merge branch 'main' into bf#348--no-moment #352 Alain Pitiot 2021-06-15 14:49:10 +0200
• 0a2ce3d167
  Merge pull request #400 from apitiot/master Alain Pitiot 2021-06-15 11:17:23 +0200
• 87d6d7fde6 Merge branch 'psychopy:main' into master #400 Alain Pitiot 2021-06-15 11:16:08 +0200
• 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 Alain Pitiot 2021-06-15 11:15:50 +0200
• a4b24145a8 BF: remove onunhandledrejection but keep data-error #399 Thomas Pronk 2021-06-14 22:48:37 +0100
• e9bf754382 core/PsychoJS: restore _captureErrors #398 Sotiri Bakagiannis 2021-06-14 22:34:49 +0100
• 29795025b9 visual/TextInput: upgrade to PIXI.TextInput latest, with patches applied Sotiri Bakagiannis 2021-06-14 21:06:52 +0100
• 77cdfa9646 visual/Form: clean up slider options merging #394 Sotiri Bakagiannis 2021-06-11 20:57:51 +0100
• f372162553 visual/Form: add granularity per item override Sotiri Bakagiannis 2021-06-11 20:45:53 +0100
• 19c062c77c visual/Form: add Form.Type.SLIDER support Sotiri Bakagiannis 2021-06-11 20:38:37 +0100
• 2776ad417f visual/Form: no need to alias RADIO as CHOICE type in Form.Types Sotiri Bakagiannis 2021-06-11 20:31:59 +0100
• d613518ca6
  Update Automated Test (full).yml tpronk 2021-06-11 15:49:31 +0100
• 04bd836e0a
  Merge pull request #393 from apitiot/master Alain Pitiot 2021-06-11 15:30:07 +0200
• 9865eaba4a fromSnapshot now handles thisTrial as well #393 Alain Pitiot 2021-06-11 15:29:36 +0200
• 5d4101b84d
  Merge pull request #392 from apitiot/master Alain Pitiot 2021-06-11 15:17:40 +0200
• 598fa080ee added a getter for finished in TrialHandler #392 Alain Pitiot 2021-06-11 15:16:02 +0200
• a6df4c4fb9
  BF: Fix version number (for the testing scripts) #376 tpronk 2021-06-11 11:32:46 +0100
• 64ce180c32
  BF: NPM package-lock workaround tpronk 2021-06-11 11:26:38 +0100
• cad60bb964
  Merge pull request #390 from thewhodidthis/bf#322--slider Alain Pitiot 2021-06-11 10:19:18 +0200
• 117bca855f
  Merge pull request #389 from thewhodidthis/bf#388--git-cleanup Alain Pitiot 2021-06-11 10:18:49 +0200
• c753469e1c
  Merge pull request #385 from thewhodidthis/bf#341--textbox-scroll Alain Pitiot 2021-06-11 10:18:22 +0200
• 0da4e6ff66
  Merge pull request #391 from apitiot/master Alain Pitiot 2021-06-11 10:14:38 +0200
• c9b19c657b added the notion of dependent stimuli to Slider, in order to accommodate a more standard way of rendering Form in the generated .js code, i.e. form.setAutoDraw(true), rather than the historically correct form.draw() #391 Alain Pitiot 2021-06-11 10:12:59 +0200
• 0e3a23f5d0 visual/Slider: provide fillColor aliases for markerColor #390 Sotiri Bakagiannis 2021-06-11 08:45:05 +0100
• c3e35e7713 git: clear out extra JS / CSS index files in package root #389 Sotiri Bakagiannis 2021-06-11 07:23:25 +0100
• 94264e3e75
  Merge pull request #387 from apitiot/master Alain Pitiot 2021-06-11 07:24:33 +0200
• fcd7642bee added fromSnapshot static method to TrialHandler to restore internal state from snapshot; should fix the nested loop thisN issue #387 Alain Pitiot 2021-06-11 07:20:30 +0200
• 13461b9169 visual/TextInput: permanently disable substitute text #385 Sotiri Bakagiannis 2021-06-10 18:38:54 +0100
• b9aee09474
  Merge pull request #382 from tpronk/fix_seedrandom Alain Pitiot 2021-06-10 15:26:00 +0200
• fb0b231014 RF: follow PsychoJS style guide #382 Thomas Pronk 2021-06-10 13:13:41 +0100
• 170cf423d3 RF: leverage _setAttribute, rename rng to randomNumberGenerator Thomas Pronk 2021-06-09 16:04:57 +0100
• 6c292ea2d9 RF: use seed getter and setter via _addAttribute Thomas Pronk 2021-06-09 14:32:52 +0100
• 148dda46ff BF: Make seedrandom work again Thomas Pronk 2021-06-09 13:57:28 +0100
• bad98abde7
  Merge pull request #378 from thewhodidthis/bf#318--textbox Alain Pitiot 2021-06-09 14:00:07 +0200
• 724177fd96
  Merge pull request #381 from thewhodidthis/bf#379--preloadjs Sotiri Bakagiannis 2021-06-09 12:30:52 +0100
• 5520382497 package: drop preloadjs from deps #381 Sotiri Bakagiannis 2021-06-09 07:27:42 +0100
• 92d97f1f83 core/ServerManager: drop preloadjs import Sotiri Bakagiannis 2021-06-09 07:26:53 +0100
• e2a9d08de8 visual/TextInput: use nullish coalescing operator for stroke styling fallbacks #378 Sotiri Bakagiannis 2021-06-08 19:01:14 +0100
• 569432b5c5 ENH: Update pythonisms to be more like python Thomas Pronk 2021-06-08 16:10:52 +0100
• 4e08d1e26f
  Merge pull request #375 from thewhodidthis/bf#374--lockfile Sotiri Bakagiannis 2021-06-08 15:00:51 +0100
• b285283f9e git/npm: tweak lock file #375 Sotiri Bakagiannis 2021-06-08 13:27:15 +0100
• 4bcf81d315
  Merge pull request #372 from thewhodidthis/bf#367--movie-preload Alain Pitiot 2021-06-08 13:52:26 +0200
• db9b6dd69e
  Merge branch 'main' into bf#367--movie-preload #372 Alain Pitiot 2021-06-08 13:52:21 +0200
• 3b4dd80e11
  Merge pull request #368 from tpronk/test_ready Sotiri Bakagiannis 2021-06-07 22:46:19 +0100
• d9c5f816ee Check more carefully whether the error properties exist #368 Thomas Pronk 2021-06-07 12:17:16 +0100
• e77688ce56 core/ServerManager: import PreloadJS for side effects Sotiri Bakagiannis 2021-06-07 11:38:13 +0100
• c5545ca12d package: bring back the old PreloadJS, but from GH Sotiri Bakagiannis 2021-06-07 11:36:42 +0100
• f532e739ae package: drop moment from deps Sotiri Bakagiannis 2021-06-04 11:57:26 +0100
• 4c1426dea5 util/Clock: split date formatting and parsing into separate funcs, drop moment import Sotiri Bakagiannis 2021-06-04 11:50:20 +0100
• 4ce8641639 Merge branch 'main' into bf#348--no-moment Sotiri Bakagiannis 2021-06-04 10:02:16 +0100
• a27387e706
  Merge pull request #365 from thewhodidthis/nf#364--target Alain Pitiot 2021-06-04 10:21:10 +0200
• 2bbdb6e299
  Merge pull request #363 from thewhodidthis/bf#362--sourcemap Alain Pitiot 2021-06-04 09:05:15 +0200
• 58e772698e RF: use log4javascript from Ritzlgrmft instead of tpronk Thomas Pronk 2021-06-03 18:19:11 +0100
• f11e356653 RF: clean up improved error logging Thomas Pronk 2021-06-03 18:13:36 +0100
• e1813c2e03 BF: properly log errors thrown by PsychoJS itself Thomas Pronk 2021-06-03 18:06:39 +0100
• 0a9fd0d831
  BF: make psychopy/psychojs default repo tpronk 2021-06-03 12:35:13 +0100
• 9fa2d0e413 BF: workaround access denied, see description of this commit Thomas Pronk 2021-06-03 12:28:46 +0100
• 28d90d0205 BF: workaround for permission denied error? Thomas Pronk 2021-06-03 12:20:00 +0100
• 2b0061f510 BF: Workaround for permission denied issue? Thomas Pronk 2021-06-03 12:16:06 +0100
• 6cb6d4d202 scripts: override esbuild default target #365 Sotiri Bakagiannis 2021-06-03 12:07:34 +0100
• ccfc44a4ce ENH: Add error logging for unhandled rejections Thomas Pronk 2021-06-03 11:56:34 +0100
• 8b3c04987c RF: Add correct version number Thomas Pronk 2021-06-03 11:56:00 +0100
• 9e09356e19 Merge branch 'main' into bf#348--no-moment Sotiri Bakagiannis 2021-06-03 09:49:14 +0100
• cfbfc16f7e scripts: add sourcemap option for esbuild #363 Sotiri Bakagiannis 2021-06-03 09:36:30 +0100
• 33736657b9
  Merge pull request #361 from psychopy/nf#360--iife Alain Pitiot 2021-06-02 19:43:26 +0200