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

• 3508a16322 scripts: clean up #361 Sotiri Bakagiannis 2021-06-02 18:36:57 +0100
• 3fe9c9cb2c scripts/js: add an iife outfile with PsychoJS global Sotiri Bakagiannis 2021-06-02 18:11:01 +0100
• 5b202eb396 Merge branch 'main' into bf#348--no-moment Sotiri Bakagiannis 2021-06-02 13:51:28 +0100
• d495dd95fa
  Merge pull request #342 from tpronk/improve_error_logging Alain Pitiot 2021-06-02 14:27:11 +0200
• f5ac7d7789
  Merge pull request #358 from thewhodidthis/bf#357-bundling Alain Pitiot 2021-06-02 14:21:07 +0200
• 7d3a264818 data: comment out the Shelf #358 Sotiri Bakagiannis 2021-06-02 13:20:08 +0100
• 3ce93c9642 Merge branch 'main' into bf#357-bundling Sotiri Bakagiannis 2021-06-02 13:12:18 +0100
• 8bd1030afa
  Merge pull request #359 from apitiot/master Alain Pitiot 2021-06-02 13:56:44 +0200
• 725e5ca28f updated version number #359 Alain Pitiot 2021-06-02 13:53:50 +0200
• 01491ef99b BF: re-added console.error on error #342 Thomas Pronk 2021-06-02 10:39:24 +0100
• f46b9fee2d scripts/css: clean up imports Sotiri Bakagiannis 2021-06-01 17:59:08 +0100
• 15b6688f3e scripts: separate out legal notices, add banner, clean up imports Sotiri Bakagiannis 2021-06-01 17:58:49 +0100
• 6c5d7750d7 package: add json extension to exports field Sotiri Bakagiannis 2021-06-01 17:58:25 +0100
• 6354cd95f6 editorconfig: use tabs with .cjs files Sotiri Bakagiannis 2021-06-01 17:47:01 +0100
• f331432033 package: update lockfile version to match x Sotiri Bakagiannis 2021-06-01 17:46:45 +0100
• bf4fe0b3db sound: drop Transcriber export for now Sotiri Bakagiannis 2021-06-01 17:44:55 +0100
• 9e10fa489a _ Alain Pitiot 2021-06-01 13:35:51 +0200
• abc2c1a5d6 Merge branch 'master' of github.com:apitiot/psychojs Alain Pitiot 2021-06-01 13:35:17 +0200
• ad7f192657 _ Alain Pitiot 2021-06-01 13:34:51 +0200
• 4c06c145eb Merge branch 'master' of github.com:apitiot/psychojs Alain Pitiot 2021-06-01 13:34:07 +0200
• d2289a6b88 Merge branch 'master' of github.com:apitiot/psychojs Alain Pitiot 2021-06-01 13:34:07 +0200
• 823834d904 _ Alain Pitiot 2021-06-01 13:32:21 +0200
• d6e79f62e2 _ Alain Pitiot 2021-06-01 13:32:21 +0200
• eb277adaee _ Alain Pitiot 2021-06-01 13:32:21 +0200
• 868a8e7dce _ Alain Pitiot 2021-06-01 13:28:36 +0200
• ba8d6f5092 _ Alain Pitiot 2021-06-01 13:28:36 +0200
• b834b68a3d Merge branch 'master' of github.com:apitiot/psychojs Alain Pitiot 2021-06-01 11:04:53 +0200
• 0bac3ee235 Merge branch 'master' of github.com:apitiot/psychojs Alain Pitiot 2021-06-01 11:04:53 +0200
• 7ebca99430 _ Alain Pitiot 2021-06-01 11:04:48 +0200
• 1c8bfcf4b4 Merge branch 'psychopy:main' into master Alain Pitiot 2021-06-01 11:03:50 +0200
• 27ffab0447 Merge branch 'psychopy:main' into master Alain Pitiot 2021-06-01 11:03:50 +0200
• 80f1cccde8 added missing docs Alain Pitiot 2021-05-31 13:49:13 +0200
• ef08c44c02 added missing docs Alain Pitiot 2021-05-31 13:49:13 +0200
• f9b9620dca
  Merge pull request #338 from thewhodidthis/bf#334--font Alain Pitiot 2021-05-31 13:04:16 +0200
• 9249ad5040 Merge pull request #338 from thewhodidthis/bf#334--font Alain Pitiot 2021-05-31 13:04:16 +0200
• 4cf0367468
  Merge branch 'main' into bf#334--font #338 Alain Pitiot 2021-05-31 13:04:09 +0200
• f9df73b4fe Merge branch 'main' into bf#334--font Alain Pitiot 2021-05-31 13:04:09 +0200
• e4aec61fcd
  Merge pull request #354 from thewhodidthis/bf#300-gui Alain Pitiot 2021-05-31 13:00:06 +0200
• b0a97cf3e6 Merge pull request #354 from thewhodidthis/bf#300-gui Alain Pitiot 2021-05-31 13:00:06 +0200
• f5b06bff0b
  Merge pull request #340 from tpronk/textbox_stay_on_resize Alain Pitiot 2021-05-31 12:46:19 +0200
• 04b21a4274 Merge pull request #340 from tpronk/textbox_stay_on_resize Alain Pitiot 2021-05-31 12:46:19 +0200
• f4d17f0020
  Merge pull request #355 from thewhodidthis/nf#335--deps Alain Pitiot 2021-05-31 11:59:25 +0200
• 994bc98a96 Merge pull request #355 from thewhodidthis/nf#335--deps Alain Pitiot 2021-05-31 11:59:25 +0200
• 56655a1d85
  Merge branch 'main' into nf#335--deps #355 Alain Pitiot 2021-05-31 11:59:19 +0200
• 811c7fee11 Merge branch 'main' into nf#335--deps Alain Pitiot 2021-05-31 11:59:19 +0200
• 4daf5eb1b9 _ Alain Pitiot 2021-05-31 09:29:15 +0200
• 8badaf7ade _ Alain Pitiot 2021-05-31 09:29:15 +0200
• be9ff63996 _ Alain Pitiot 2021-05-31 09:25:09 +0200
• 721b88631a _ Alain Pitiot 2021-05-31 09:25:09 +0200
• d07108d86d
  Merge pull request #1 from psychopy/main Alain Pitiot 2021-05-31 08:48:29 +0200
• 311ffa5a10 Merge pull request #1 from psychopy/main Alain Pitiot 2021-05-31 08:48:29 +0200
• 0215d01c54 Merge pull request #1 from psychopy/main Alain Pitiot 2021-05-31 08:48:29 +0200
• 3130773b94 Merge pull request #1 from psychopy/main Alain Pitiot 2021-05-31 08:48:29 +0200
• 023940735b
  Merge branch 'master' into main Alain Pitiot 2021-05-31 08:47:47 +0200
• 54e57c46c1 Merge branch 'master' into main Alain Pitiot 2021-05-31 08:47:47 +0200
• 9bf3eb7d82 Merge branch 'master' into main Alain Pitiot 2021-05-31 08:47:47 +0200
• 0873570bae Merge branch 'master' into main Alain Pitiot 2021-05-31 08:47:47 +0200
• aad2753a0b _ Alain Pitiot 2021-05-31 08:32:35 +0200
• f155192fd5 _ Alain Pitiot 2021-05-31 08:32:35 +0200
• 4f5a9e7e81 _ Alain Pitiot 2021-05-31 08:32:35 +0200
• 60cfc55627 _ Alain Pitiot 2021-05-31 08:32:35 +0200
• ba90bb0ef5 scripts: use psychojs prefix for now Sotiri Bakagiannis 2021-05-27 20:08:28 +0100
• dc068df9a0 src/*: use imports for deps Sotiri Bakagiannis 2021-05-27 19:21:03 +0100
• a92781c364 git: ignore out folder Sotiri Bakagiannis 2021-05-27 19:18:13 +0100
• 2a2b5d4e2e git/package: add and upgrade engines and deps, use esbuild custom scripts Sotiri Bakagiannis 2021-05-27 19:18:03 +0100
• 191ca3458e core/GUI: restore warning about required fields #354 Sotiri Bakagiannis 2021-05-27 11:17:28 +0100
• 3fd199dd26
  build(deps): bump browserslist from 4.16.4 to 4.16.6 #353 dependabot[bot] 2021-05-27 03:09:08 +0000
• 020978f4f0
  Update README.md Alain Pitiot 2021-05-25 14:33:37 +0200
• 21d39e8d46
  Update README.md Alain Pitiot 2021-05-25 14:32:38 +0200
• 43be6cad04 util/Clock: fix JSDoc Sotiri Bakagiannis 2021-05-25 13:12:14 +0100
• 78b4466c6a util/Clock: drop the ISO part in favour of session specific timestamps Sotiri Bakagiannis 2021-05-25 12:18:29 +0100
• e35113da7d Merge branch 'main' into bf#348--no-moment Sotiri Bakagiannis 2021-05-25 11:32:18 +0100
• fbd30ab2db
  Merge pull request #345 from thewhodidthis/bf#339--trial-handler Alain Pitiot 2021-05-25 11:04:17 +0200
• f23b696814
  Merge pull request #349 from thewhodidthis/bf#346--sound Alain Pitiot 2021-05-25 10:39:16 +0200
• ee1edfa99c data/TrialHandler: drop the getter on trialIterator #345 Sotiri Bakagiannis 2021-05-25 09:35:55 +0100
• 37c4e2d9de
  Merge pull request #333 from thewhodidthis/nf#315--form Alain Pitiot 2021-05-25 10:27:22 +0200
• ec17ceb303 util/Clock: drop moment and the format argument from getDateStr() Sotiri Bakagiannis 2021-05-24 13:16:56 +0100
• 2303fffa3f
  BF: Trivial change to trigger GitHub to rebuild the pages tpronk 2021-05-24 13:03:26 +0100
• f44ba55291
  Merge pull request #351 from thewhodidthis/bf#347--no-master Jon Peirce 2021-05-24 13:01:40 +0100
• ba8a974fd4 DOCS: update contributing guide to reflect default branch is now main #351 Sotiri Bakagiannis 2021-05-24 10:12:47 +0100
• 1987c26b93
  Merge pull request #350 from tpronk/add_CONTIBUTING Sotiri Bakagiannis 2021-05-21 11:48:14 +0100
• e44e3ea569 DOCS: Contribution guide #350 Thomas Pronk 2021-05-21 11:30:25 +0100
• 61ea059cd5 sound/TrackPlayer: drop extra play / seek calls #349 Sotiri Bakagiannis 2021-05-21 07:44:53 +0100
• 91f5c86adc data/TrialHandler: add next method, trialIterator getter Sotiri Bakagiannis 2021-05-19 17:18:47 +0100
• 9b5adc8522
  Update package.json tpronk 2021-05-19 15:39:52 +0100
• 843e8eec79
  Update package.json tpronk 2021-05-19 15:29:36 +0100
• 284542c114
  Merge pull request #344 from tpronk/testrun_badges Sotiri Bakagiannis 2021-05-18 13:52:38 +0100
• 3efb310faf
  Update node to v14 tpronk 2021-05-18 13:08:48 +0100
• 5ce13c95d2
  Add testrun badges to README #344 tpronk 2021-05-18 00:17:53 +0100
• 82c274e6d7 Improve logging (of errors thrown by PsychoJS) Thomas Pronk 2021-05-18 00:01:49 +0100
• de2b210e99 Retain entered text (and placeholder) upon resize #340 Thomas Pronk 2021-05-17 23:10:47 +0100
• 733526ae63
  Update Automated Test (short).yml tpronk 2021-05-17 20:36:44 +0100
• d1ce5a17fc
  Update and rename test_thorough.yml to Automated Test (full).yml tpronk 2021-05-17 20:36:25 +0100
• 32869b9924
  Rename to "fast" to "short" tpronk 2021-05-17 20:34:46 +0100
• cb64593af0
  Update test_thorough.yml tpronk 2021-05-17 18:33:23 +0100
• e5539399f2
  Update default label to "fast" tpronk 2021-05-17 17:55:24 +0100
• 8274d2c04e Merge branch 'psychopy:master' into master #332 tpronk 2021-05-17 17:50:33 +0100
• 4a7719d1e1 Clean up debugging code Thomas Pronk 2021-05-17 17:50:07 +0100
• d7fd85fa7b Examining how to get "could not find appropriate player" logged Thomas Pronk 2021-05-17 17:42:31 +0100
• cccfbd72c8 BF: convert message to a String on iOS13 Safari Thomas Pronk 2021-05-17 17:27:54 +0100