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

• 26e44b147f
  Merge pull request #337 from peircej/master Sotiri Bakagiannis 2021-05-17 15:16:31 +0100
• 864eab588a visual/Slider: clean up JSDoc for font, use Arial by default Sotiri Bakagiannis 2021-05-17 14:26:06 +0100
• 7f4899ed5e DOCS: better wording regarding generating PsychoJS from Builder #337 Jon Peirce 2021-05-17 14:25:19 +0100
• 4cc9630610 visual/Form: support font property Sotiri Bakagiannis 2021-05-17 14:22:22 +0100
• b8fd62f68d DOCS: move the Code Covenant badge to the top of page Jon Peirce 2021-05-17 14:20:07 +0100
• 22c082cca7 DOCS: readme updated and code of conduct added Jon Peirce 2021-05-17 14:18:24 +0100
• 0121eeab1d
  Merge pull request #320 from thewhodidthis/bf#290--bom Alain Pitiot 2021-05-16 16:51:17 +0200
• 1ee86be4f8
  Merge pull request #327 from thewhodidthis/nf#316--button Alain Pitiot 2021-05-16 16:48:12 +0200
• 0cafac1689 visual/Slider/Form/TextBox: towards implementing five color model #333 Sotiri Bakagiannis 2021-05-14 20:59:30 +0100
• 1a5673068f Merge branch 'master' of https://github.com/tpronk/psychojs #330 Thomas Pronk 2021-05-14 15:48:38 +0100
• 495f4ea80a Corrected the bug I introduced with the bugfix Thomas Pronk 2021-05-14 15:48:31 +0100
• e862349757 Merge branch 'psychopy:master' into master tpronk 2021-05-13 21:53:55 +0100
• a326dc3a12 Keep entered text in TextBox after a refresh (for instance due to window resize) Thomas Pronk 2021-05-13 21:53:22 +0100
• 52b53376d8 visual/ButtonStim: make sure isClicked tracks left mouse button presses only #327 Sotiri Bakagiannis 2021-05-10 16:14:09 +0100
• 2dd1d599e2
  Let's see if it runs this evening tpronk 2021-05-10 15:39:41 +0100
• b0d7701878
  ENH: Changed CRON time for a test tpronk 2021-05-10 15:24:38 +0100
• 335f7dfece visual/TextBox: import ButtonStim class Sotiri Bakagiannis 2021-05-10 14:33:33 +0100
• 6e5f63baff visual/ButtonStim: fix class name Sotiri Bakagiannis 2021-05-10 14:33:08 +0100
• d475a02479
  Create test_thorough.yml tpronk 2021-05-10 14:31:12 +0100
• 0701354f15
  BF: path issues tpronk 2021-05-10 14:27:12 +0100
• 43b36a95d1
  BF: Fix typo tpronk 2021-05-10 14:24:05 +0100
• 45a2bb1938
  Create test_fast.yml tpronk 2021-05-10 14:22:38 +0100
• 6e1befa8c6 visual: export ButtonStim Sotiri Bakagiannis 2021-05-10 14:04:46 +0100
• 61e41553d3 visual/TextBox+TextInput: skip event listeners for ButtonStim Sotiri Bakagiannis 2021-05-10 14:04:32 +0100
• 05eb0aabf0 visual/ButtonStim: translate over from PsychoPy Sotiri Bakagiannis 2021-05-10 13:52:33 +0100
• 2d299c7730
  Merge pull request #326 from RebeccaHirst/_addformComplete Sotiri Bakagiannis 2021-05-10 11:58:19 +0100
• cfc2debcf6 cleanup formcomplete #326 RebeccaHirst 2021-05-10 11:18:18 +0100
• f1e4e5b5b9
  Merge pull request #317 from tpronk/master Alain Pitiot 2021-05-10 08:10:27 +0200
• 5eac810d50 BF: support sliders in forms #325 RebeccaHirst 2021-05-09 21:46:16 +0100
• c529471354 add getMarker method #324 RebeccaHirst 2021-05-08 00:16:34 +0100
• ea3501405b Merge branch 'psychopy:master' into master #308 Rebecca Hirst 2021-05-07 23:52:15 +0100
• bdc3915b23
  Update Form.js Rebecca Hirst 2021-05-07 23:29:56 +0100
• 98a5de434f data/ExperimentHandler: tweak for XLSX not prepending BOM when converting to csv #320 Sotiri Bakagiannis 2021-05-07 14:33:03 +0100
• 54e21ff90e package-lock needed to cache dependencies in GitHub Workflows #317 Thomas Pronk 2021-04-29 17:09:32 +0100
• 9c28f51817 Write captured errors to body.data-report attribute Thomas Pronk 2021-04-29 15:29:46 +0100
• 5a12d3210c Ignore node_modules directory Thomas Pronk 2021-04-29 15:21:55 +0100
• d92d8757fe Prefix cross-var with npx, so it runs in GitHub Workflows Thomas Pronk 2021-04-29 15:21:38 +0100
• 8ea6aee1b4 Merge branch 'master' of github.com:psychopy/psychojs Alain Pitiot 2021-04-27 08:20:44 +0200
• 73cb6f6e40 _ Alain Pitiot 2021-04-27 08:20:15 +0200
• ed3c499879 Remove docs from repo #309 Thomas Pronk 2021-04-21 16:01:57 +0100
• 66da9be075 Ignore docs directory Thomas Pronk 2021-04-21 16:00:21 +0100
• 2881bb8a49 Commit package-lock for caching Thomas Pronk 2021-04-21 14:05:30 +0100
• a52bc8c573
  Update package.json tpronk 2021-04-21 13:36:04 +0100
• 2cd41df5ba
  Merge pull request #1 from psychopy/master tpronk 2021-04-21 13:35:39 +0100
• 980519c84c
  Merge pull request #305 from thewhodidthis/nf#304--eslint Alain Pitiot 2021-04-21 06:00:14 +0200
• 7f527e0f5c Add cross-var dependency and prefix build:cc with cross-var Thomas Pronk 2021-04-19 19:54:12 +0100
• 99247a8f13 remove complete as method #307 RebeccaHirst 2021-04-19 12:57:27 +0100
• d5006a0c9a add doc to complete RebeccaHirst 2021-04-19 11:52:34 +0100
• 3e637bd0bb Merge branch 'master' of https://github.com/RebeccaHirst/psychojs RebeccaHirst 2021-04-19 11:50:39 +0100
• 823eeb07aa add complete and fromComplete methods to Form RebeccaHirst 2021-04-19 11:50:33 +0100
• 9116a4a2d0
  Merge pull request #1 from psychopy/master Rebecca Hirst 2021-04-19 11:44:11 +0100
• 8721b064eb git/package: add eslint config #305 Sotiri Bakagiannis 2021-04-16 09:30:09 +0100
• dd0d63663f package: bring in eslint to replace jshint Sotiri Bakagiannis 2021-04-16 09:29:54 +0100
• 5f4496ebdf
  Merge pull request #303 from thewhodidthis/nf#174--repackaging Alain Pitiot 2021-04-15 17:31:25 +0200
• 8f0510dfda package: up version #303 Sotiri Bakagiannis 2021-04-15 14:03:47 +0100
• 752337184a core/Window: fix import paths for rollup Sotiri Bakagiannis 2021-04-15 13:59:52 +0100
• 678712b26e css: clean up Sotiri Bakagiannis 2021-04-15 13:49:20 +0100
• d03d1be59f editorconfig: use spaces for css Sotiri Bakagiannis 2021-04-15 13:49:08 +0100
• 3adfe76621 git: move stylesheet into src dir Sotiri Bakagiannis 2021-04-15 13:48:11 +0100
• 5cc32f2f50 git: ignore dist dir Sotiri Bakagiannis 2021-04-15 13:47:22 +0100
• 3587c689e8 git: add package.json, rollup build script Sotiri Bakagiannis 2021-04-15 13:46:44 +0100
• e1df2bc19c js/src: add index files to re-export components from each module folder Sotiri Bakagiannis 2021-04-15 13:45:13 +0100
• bcbf62e724 git: rename js folder to src Sotiri Bakagiannis 2021-04-15 13:39:02 +0100
• 1a8653aa39 documentation for 2021.1.4 Alain Pitiot 2021-04-09 13:59:44 +0200
• 328127979a Merge branch 'master' of github.com:psychopy/psychojs Alain Pitiot 2021-04-09 13:57:42 +0200
• 4208fc5e9a changed version number and copyright Alain Pitiot 2021-04-09 13:57:33 +0200
• a1bcbfe2e2
  Merge pull request #302 from thewhodidthis/bf#301--textbox Alain Pitiot 2021-04-09 13:57:15 +0200
• 599da154aa core/Keyboard: re-allow default behaviour on keydown #302 Sotiri Bakagiannis 2021-04-09 12:52:44 +0100
• 9183221e28 Merge branch 'master' of github.com:psychopy/psychojs Alain Pitiot 2021-04-09 13:44:55 +0200
• 9b9d4e335e _ Alain Pitiot 2021-04-09 13:44:26 +0200
• 8b1ee8afeb
  Merge pull request #154 from thewhodidthis/nf#132--sound Alain Pitiot 2021-04-09 13:20:33 +0200
• bdcd4ac278
  Merge pull request #203 from thewhodidthis/bf#202--opacity Alain Pitiot 2021-04-09 13:19:15 +0200
• 55b1789e2f
  Merge pull request #281 from thewhodidthis/bf#280--forms Alain Pitiot 2021-04-09 13:18:48 +0200
• e9d6119a21
  Merge pull request #292 from thewhodidthis/bf#291--set-image Alain Pitiot 2021-04-09 13:17:59 +0200
• 45ae6d9a8a
  Merge pull request #296 from thewhodidthis/nf#294--fades Alain Pitiot 2021-04-09 13:17:17 +0200
• a00211478c visual/MovieStim: drop set opacity attribute from constructor (no effect) #203 Sotiri Bakagiannis 2021-04-08 16:11:10 +0100
• afabc784ff
  Merge 29906403c4 into 872f5e71f1 #258 Sotiri Bakagiannis 2021-04-07 17:04:15 +0100
• fcac8d42bb sound/TrackPlayer: fix typo, add JSDoc comments for fadeDuration #296 Sotiri Bakagiannis 2021-03-29 17:01:57 +0100
• e6a21d3cc3 sound/TrackPlayer: add fades on play / stop Sotiri Bakagiannis 2021-03-29 16:53:35 +0100
• f19b46272e visual/ImageStim: check against the 'src' attribute #292 Sotiri Bakagiannis 2021-03-24 13:05:50 +0000
• 987244e9fb Merge branch 'master' into bf#202--opacity Sotiri Bakagiannis 2021-03-19 06:56:06 +0000
• 5d202b7526 visual/ImageStim: check if image attribute different before onChange call Sotiri Bakagiannis 2021-03-18 18:09:57 +0000
• 872f5e71f1
  Merge pull request #249 from thewhodidthis/bf#238--slider Sotiri Bakagiannis 2021-03-17 14:25:50 +0000
• 99be6f5419
  Merge pull request #93 from sijiazhao/master Sotiri Bakagiannis 2021-03-02 21:48:46 +0000
• 1c72866eca
  Merge branch 'master' into master #93 Sotiri Bakagiannis 2021-03-02 21:46:33 +0000
• 8bb7884493
  Merge pull request #274 from sijiazhao/clearEvents-fix Sotiri Bakagiannis 2021-02-28 12:31:20 +0000
• 0789711228 Remove unnecessary argument: undefined #274 Sijia Zhao 2021-02-27 00:16:43 +0000
• e95fcb7201 Merge branch 'master' of github.com:psychopy/psychojs Alain Pitiot 2021-02-25 16:55:39 +0100
• a3443f64bb version 2021.1.1 Alain Pitiot 2021-02-25 16:55:33 +0100
• a2229ea483
  Merge pull request #285 from thewhodidthis/bf#283--image-textures Alain Pitiot 2021-02-25 16:47:30 +0100
• 88531a2cb8 visual/ImageStim: tweak texture related PIXI calls #285 Sotiri Bakagiannis 2021-02-25 15:40:19 +0000
• e9d4162172 package/npm: tweak css build script to include version #216 Sotiri Bakagiannis 2021-02-25 13:41:09 +0000
• d561976627 visual/ShapeStim: rotate vertices not PIXI sprite #282 Sotiri Bakagiannis 2021-02-24 19:03:52 +0000
• d8a88bdbe3 util/Util: add point rotate helper Sotiri Bakagiannis 2021-02-24 19:02:56 +0000
• 225030cd16 visual/Form: support the radio type, same as choice #281 Sotiri Bakagiannis 2021-02-24 11:54:53 +0000
• 58d412f10c
  Merge pull request #278 from apitiot/master 2021.1.0 Alain Pitiot 2021-02-20 13:03:34 +0100
• 867add56a4 updated the documentation #278 Alain Pitiot 2021-02-20 13:02:55 +0100
• 54bed68e64
  Merge pull request #277 from apitiot/master Alain Pitiot 2021-02-20 12:20:34 +0100
• 92c4d1d0b9 changed version number to 2020.1.0 #277 Alain Pitiot 2021-02-20 12:18:07 +0100
• 6c293c1cbd
  Merge pull request #252 from thewhodidthis/bf#215--css-escape Alain Pitiot 2021-02-20 08:53:24 +0100