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

• 88548e23d8
  Merge pull request #100 from thewhodidthis/bf#87--orientation Alain Pitiot 2020-07-31 16:24:26 +0200
• e3f8e7593c
  Merge pull request #119 from thewhodidthis/bf#115--gui Alain Pitiot 2020-07-31 16:23:34 +0200
• 58947e5fa4
  Merge pull request #122 from thewhodidthis/nf#121--randint Alain Pitiot 2020-07-31 16:22:37 +0200
• 770d02d156
  Merge branch 'master' into nf#121--randint #122 Alain Pitiot 2020-07-31 16:22:25 +0200
• 8bb4753d20
  Merge pull request #107 from peircej/master Alain Pitiot 2020-07-31 16:17:45 +0200
• a447a495e5
  Merge pull request #129 from thewhodidthis/nf#128--math Alain Pitiot 2020-07-31 16:16:29 +0200
• 394311e650
  Merge pull request #112 from thewhodidthis/nf#111--release Alain Pitiot 2020-07-31 16:13:21 +0200
• 2088cf75c7 util/Util: add sum helper #129 Sotiri Bakagiannis 2020-07-30 14:57:55 +0100
• 9308989117 util/Util: add round helper Sotiri Bakagiannis 2020-07-30 14:55:28 +0100
• 894dcd855c visual/TextStim: adjust text opacity based on color invisibility flag #127 Sotiri Bakagiannis 2020-07-30 09:26:20 +0100
• aea8fe5f14 visual/Slider: adjust opacity based on color invisibility flag where appropriate Sotiri Bakagiannis 2020-07-30 09:25:46 +0100
• e2a1e9b42c visual/ShapeStim: adjust opacity based on color invisibility flag where appropriate Sotiri Bakagiannis 2020-07-30 09:25:30 +0100
• b341abd613 util/Color: detect known unknowns, add invisibility getter Sotiri Bakagiannis 2020-07-30 09:16:26 +0100
• 2fd6c30ddf data/ExperimentHandler: drop duplicate isEntryEmpty method #125 Sotiri Bakagiannis 2020-07-29 09:36:26 +0100
• 7fd83d2ead util/Util: fix randint error message Sotiri Bakagiannis 2020-07-28 21:37:24 +0100
• 97542f794a util/Util: line separate the just added function opening brace Sotiri Bakagiannis 2020-07-28 15:18:17 +0100
• 7688f8df92 util/Util: add randint helper Sotiri Bakagiannis 2020-07-28 15:02:32 +0100
• f4b9717467 core/GUI: swap placement of OK/Cancel dialog box buttons #119 Sotiri Bakagiannis 2020-07-27 12:14:47 +0100
• 5b69621ffa core/MinimalStim: add release method #112 Sotiri Bakagiannis 2020-07-24 17:11:40 +0100
• e0b7bc8d5b visual/Image/Text/Movie/Shape: call destroy on internal pixi instance before updating across stimulus classes #110 Sotiri Bakagiannis 2020-07-24 17:00:37 +0100
• 30755dbcb2 data/util: add missing semicolons Sotiri Bakagiannis 2020-07-24 15:28:17 +0100
• cae18a0a3b data/TrialHandler: look for arrays in square brackets when importing conditions Sotiri Bakagiannis 2020-07-24 09:51:05 +0100
• 2a6138e4da util/Util: add turnSquareBracketsIntoArrays helper Sotiri Bakagiannis 2020-07-24 09:51:00 +0100
• 43dedcb7f7 core/Mouse: clean up JSDoc #105 Sotiri Bakagiannis 2020-07-17 16:46:36 +0100
• 2909dabf83 core/Mouse: clean up mostly JSDoc Sotiri Bakagiannis 2020-07-17 15:06:58 +0100
• 460ba1998d core/Mouse: clean up comments Sotiri Bakagiannis 2020-07-17 12:30:15 +0100
• d023ed3b8c core/Mouse: tweak isPressedIn to cover all types of arguments Sotiri Bakagiannis 2020-07-16 17:20:59 +0100
• d3a71cd18d BF: allow UK English names for colours. Any others? #107 Jon Peirce 2020-07-16 16:50:28 +0100
• e37eb5270a core/Mouse: add isPressedIn method Sotiri Bakagiannis 2020-07-14 12:57:20 +0100
• 9c17e0767e visual/Slider: drop contains method override, inherit from visual base class #103 Sotiri Bakagiannis 2020-07-08 13:40:38 +0100
• b48bc26af4 visual/Text: drop contains method override, inherit from visual base class Sotiri Bakagiannis 2020-07-08 13:40:07 +0100
• 225c3ecf69 visual/Visual: move contains method from movie to parent class Sotiri Bakagiannis 2020-07-08 13:34:04 +0100
• e72da164ea css: center root pseudo message using tranform/translate #102 Sotiri Bakagiannis 2020-07-07 11:07:58 +0100
• f12ccafff3 visual/VisualStim: flip rotations to reflect psychopy convention #100 Sotiri Bakagiannis 2020-07-07 10:35:16 +0100
• 08972dae90
  Merge pull request #99 from thewhodidthis/bf#53+83--slider Alain Pitiot 2020-07-03 14:38:41 +0200
• 1fc76d1461 complete linting, saving of partial results, improved GUI, various bug fixes Alain Pitiot 2020-07-03 14:26:43 +0200
• 2ba835f5c2 visual/Slider: override refresh method a-la ShapeStim #99 Sotiri Bakagiannis 2020-07-03 11:45:12 +0100
• d665035e7c ENH: read csv files with or without BOM #95 Hiroyuki Sogo 2020-06-12 16:44:18 +0900
• 3ee07c994c BF: Remove <form>...</form> elements Sijia Zhao 2020-05-27 22:08:14 +0100
• 8276bd790a replace jquery escapeSelector by CSS.escape since the latter is standard and the former is only available in jquery 3.0 Alain Pitiot 2020-05-24 14:23:00 +0200
• c48af52eec
  Merge pull request #90 from sijiazhao/master Alain Pitiot 2020-05-24 14:07:25 +0200
• f688b65cd0
  Merge branch 'master' into master #90 Alain Pitiot 2020-05-24 14:03:00 +0200
• 934484e054 cancel a recent change to slider which seems to be creating issues; take devicePixelRatio into account in Windows Alain Pitiot 2020-05-24 13:45:32 +0200
• 584d76a04f Dialogs now properly destroyed and removed from DOM when closed Sijia Zhao 2020-05-19 19:31:29 +0100
• 88827706ea ServerManager.downloadResources, ._downloadRegisteredResources: only process and download new resources, ignore existing resources Sijia Zhao 2020-05-19 19:22:19 +0100
• 0f9eeb636e GUI._onKeyChange now properly handles dropdown boxes Sijia Zhao 2020-05-19 19:07:48 +0100
• dd23484cf5 Remove need to unfocus/deselect input elements in DlgFromDict before being able to click the "Ok" button Sijia Zhao 2020-05-19 18:58:52 +0100
• e907c0c897 Prevent special characters in DlgFromDict dictionary causing DOM element selection problems Sijia Zhao 2020-05-19 18:47:16 +0100
• 4b064bccc0 Fix DlgFromDict form labels not focussing/selecting corresponding input element Sijia Zhao 2020-05-19 18:42:59 +0100
• d4b52796c9 Fix blurry Pixi canvas Sijia Zhao 2020-05-19 18:40:56 +0100
• 092829f325 Merge branch 'master' of https://github.com/psychopy/psychojs Alain Pitiot 2020-05-12 18:34:05 +0200
• 1cf40c4d8a _ Alain Pitiot 2020-05-12 18:31:11 +0200
• feddfa550a
  Merge pull request #86 from tpronk/master Alain Pitiot 2020-05-06 08:03:30 +0200
• 9a11171ba2 Update Util.js #86 tpronk 2020-04-30 15:56:31 +0200
• 926ec69386 Update Util.js tpronk 2020-04-30 15:51:31 +0200
• 0ca9e118a4 Merge branch 'master' of github.com:psychopy/psychojs Alain Pitiot 2020-02-14 08:22:33 +0100
• 4942e0156e 2020.1 branch 2020.1 Alain Pitiot 2020-02-14 08:18:25 +0100
• 0a5341b982
  Fixed typo in readme Jon Peirce 2020-02-06 10:01:17 +0000
• b0dd70222a small edits to README Alain Pitiot 2019-08-01 14:08:08 +0200
• b546ffea67 added a change log Alain Pitiot 2019-08-01 13:55:13 +0200
• 66bcefe1f1 small edits to Sound and TonePlayer Alain Pitiot 2019-08-01 13:35:20 +0200
• b461e224a6 TonePlayer: test for Tone.js (it does not load in IE11) and play sound indefinitely if duration_s == -1 Alain Pitiot 2019-08-01 11:29:14 +0200
• 039a8671c7 fixed issues: fullscreen mode, size of triangular marker in sliders; new features: window waitblanking Alain Pitiot 2019-07-31 10:37:51 +0200
• 12e011e967 3.1.5 docs & change of year on license 3.1.5 Alain Pitiot 2019-07-31 10:15:41 +0200
• 51c86240a5 version 3.1.5 Alain Pitiot 2019-07-31 10:12:17 +0200
• e9f249bcde adequately deal with mixed letter+number values in condition file Alain Pitiot 2019-07-08 10:02:51 +0200
• 845a43338d 3.1.4 docs 3.1.4 Alain Pitiot 2019-07-08 09:07:09 +0200
• d20a4cb0a5 version 3.1.4 Alain Pitiot 2019-07-08 09:05:15 +0200
• ea36343b7c
  BF: Keep filenames in conditions file as string if starting with number #62 David Bridges 2019-07-06 00:09:45 +0100
• 9c4749d012
  Merge pull request #60 from psychopy/editorConfig Alain Pitiot 2019-06-21 14:00:36 +0200
• 9700f08652 ENH: adds .editorconfig file to repo #60 David Bridges 2019-06-21 10:11:39 +0100
• 982033a1b9 Merge branch 'master' of github.com:psychopy/psychojs Alain Pitiot 2019-04-19 09:50:37 +0200
• 03f06ac64a version 3.0.8 Alain Pitiot 2019-04-19 09:50:14 +0200
• 8cd8a75baa
  Merge pull request #45 from peircej/master Alain Pitiot 2019-04-15 17:01:26 +0200
• 6b99d612c8
  Merge pull request #47 from earcanal/patch-1 Jon Peirce 2019-04-11 18:55:15 +0100
• f3813a322c
  Update Scheduler.js #47 earcanal 2019-04-11 16:54:25 +0100
• 1fbb67a5e6
  Merge pull request #46 from psychopy/rectSetSize Jon Peirce 2019-04-11 13:29:01 +0100
• fb8115c68e BF: Add setSize method to Rect #46 David Bridges 2019-04-11 13:01:58 +0100
• 9f0d4f75ce Fix: setReadOnly(false) was having no effect #45 Jon Peirce 2019-04-10 17:36:21 +0100
• becf79b5d6 version 3.0.6: various bug fixes and enhancements Alain Pitiot 2019-03-12 09:28:31 +0100
• 1512ecfdc9 various edits Alain Pitiot 2018-12-28 13:43:48 +0100
• 900f438516 version 3.0.0b13 Alain Pitiot 2018-12-28 13:13:50 +0100
• e09061f797 added MovieStim Alain Pitiot 2018-12-11 17:55:26 +0100
• 0f8e055542 _ Alain Pitiot 2018-12-10 07:56:29 +0100
• 10e2bc0650 added util module Alain Pitiot 2018-12-10 07:35:21 +0100
• 9c859abe65 small edits Alain Pitiot 2018-11-18 20:50:17 +0100
• c7b881f5ef added API to README Alain Pitiot 2018-11-18 20:49:17 +0100
• b245d5ac46 added jsdoc documentation Alain Pitiot 2018-11-18 20:37:05 +0100
• 14390697f1 fully documented the visual module; various bug fixes Alain Pitiot 2018-10-24 15:05:28 +0200
• cc9a4202e9 various cosmetic changes Alain Pitiot 2018-10-08 17:07:15 +0200
• 965814fa90 updated license notices and readme Alain Pitiot 2018-10-08 16:56:51 +0200
• 7f21c32c03 added license file Alain Pitiot 2018-10-08 16:46:25 +0200
• 86488521d6 PsychoJs version 3.0.0b11 Alain Pitiot 2018-10-08 16:44:23 +0200
• f790b5f6dd Merge pull request #11 from jonathanoroberts/master Jon Peirce 2017-06-26 09:26:04 +0100
• 5b2d0f049c Merge branch 'master' of https://github.com/psychopy/psychojs.git #11 Jon Roberts 2017-06-23 09:14:28 -0600
• e0e4b8d86b add seeding capability to psychojs random loops Jon Roberts 2017-06-22 16:53:41 -0600
• 100d72a394 Merge pull request #10 from jonathanoroberts/nreps_and_randomize Jon Peirce 2017-06-02 11:18:23 +0100
• 9cec1551c3 nReps and sequential/random/fullRandom #10 Jon Roberts 2017-05-31 14:10:22 -0600
• 9b7731de4c Merge pull request #9 from jonathanoroberts/keymapping Jon Peirce 2017-05-18 21:04:28 +0100
• 9ed64dc0fa Modify getKeys to use most pyglet keynames #9 Jon Roberts 2017-05-17 16:40:11 -0600