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

• aabd9fd43d
  Merge pull request #575 from apitiot/2023.2.1 Alain Pitiot 2023-08-11 16:40:38 +0200
• af6e9ab2a7 updated package.json #575 Alain Pitiot 2023-08-11 16:39:03 +0200
• 6e03ccfea9 youtube support for moviestim. lightest 2023-07-28 15:28:14 +0100
• c4761ff1ae missing size dimension derivation mechanics. #573 imagestim_missing_size_dimension_handling lightest 2023-07-28 15:20:32 +0100
• 0df34394e5 youtube methods corrections to match new html structure for player. #570 #520 lightest 2023-07-28 15:12:10 +0100
• e374aa6b29 missed index.css lightest 2023-07-28 14:40:00 +0100
• 15552af9fb Cleaned up youtube support. lightest 2023-07-28 14:34:30 +0100
• a53f9ae66e stim derivation code v2. lightest 2023-07-26 22:42:33 +0100
• 7d4f2de22d merge with 2023.2.0 lightest 2023-07-26 01:20:25 +0100
• 085b178ac1 version correction. lightest 2023-07-21 19:40:46 +0100
• 5284b4fae5 Merge branch '2023.2.0' into yttest lightest 2023-07-21 19:34:17 +0100
• fc221356ff
  Merge pull request #569 from lightest/2023.2.0 2023.2.0 Nikita Agafonov 2023-07-21 18:42:22 +0100
• 3e164977ef names corrections. #569 lightest 2023-07-21 18:32:34 +0100
• 71069244cb merge with 2023.2.0 lightest 2023-07-21 18:27:24 +0100
• 044c883739
  Merge pull request #568 from lightest/2023.2.0 Nikita Agafonov 2023-07-21 18:18:01 +0100
• 756c4986fa Merge branch '2023.2.0' into progress-bar #568 lightest 2023-07-21 18:04:16 +0100
• 36e6f8131a
  Merge pull request #567 from apitiot/2023.2.0 Alain Pitiot 2023-07-19 16:21:51 +0200
• 2707ed0899 _ #567 Alain Pitiot 2023-07-19 16:19:01 +0200
• 7f45cf4338 Merge branch '2023.2.0' of github.com:apitiot/psychojs into 2023.2.0_cleanup Alain Pitiot 2023-07-19 16:16:23 +0200
• ab9d030717
  Merge pull request #6 from psychopy/2023.2.0 Alain Pitiot 2023-07-19 16:11:28 +0200
• 5dba92ab37 ENH: various enhancements to the dialog box, resource manager, saving of data, capture of keys, scheduler Alain Pitiot 2023-07-19 16:07:43 +0200
• 0aa0f41067
  Merge pull request #522 from TEParsons/main-shape-arrow Alain Pitiot 2023-07-19 10:58:44 +0200
• 43bffc51bc
  Merge pull request #554 from lightest/particle_system 2022.3.0 Alain Pitiot 2023-07-19 10:51:06 +0200
• 311de2f494
  Merge branch '2022.3.0' into particle_system #554 Alain Pitiot 2023-07-19 10:50:41 +0200
• bf2b75f0c8
  Merge pull request #559 from lightest/survey_signature_pad_resize_bug Alain Pitiot 2023-07-19 10:00:33 +0200
• e9da57194a
  Merge pull request #551 from TEParsons/main-textbox-placeholder Alain Pitiot 2023-07-19 09:58:25 +0200
• 1775806a2d
  Merge pull request #553 from lightest/progress-bar Alain Pitiot 2023-07-19 09:56:47 +0200
• 122250527c
  log in constructor, additional comment #553 Alain Pitiot 2023-07-19 09:55:49 +0200
• 1eb69ed6fb
  Merge pull request #537 from lightest/xlsx_upgrade Alain Pitiot 2023-07-19 09:52:25 +0200
• 324fa88a7a
  Merge pull request #470 from RebeccaHirst/_addLinspace Alain Pitiot 2023-07-19 09:50:55 +0200
• 888552d24b
  Merge pull request #550 from lightest/blurFilter_for_imageStim Alain Pitiot 2023-07-18 17:43:28 +0200
• 6c7e8cf29f
  Properly using the _addAttribute method #566 Eitan Hemed 2023-06-24 12:38:28 +0000
• c657ad6ee2 Assigning field_separator as parameter of ExperimentHandler Eitan Hemed 2023-06-24 09:00:22 +0000
• b67f9943a3 Revert "Update ExperimentHandler.js" Eitan Hemed 2023-06-24 08:42:46 +0000
• c660feac1d Revert "Update ExperimentHandler.js" Eitan Hemed 2023-06-24 08:37:38 +0000
• 6245c380ef Revert "Update ExperimentHandler.js" Eitan Hemed 2023-06-24 08:37:26 +0000
• f1d05c8c94
  Update ExperimentHandler.js Eitan Hemed 2023-05-30 23:03:45 +0300
• 1f1566f53c
  Update ExperimentHandler.js Eitan Hemed 2023-05-30 23:00:30 +0300
• 6e865cd963
  Update ExperimentHandler.js Eitan Hemed 2023-05-30 22:57:35 +0300
• 968c52505d added isDragging readonly property to visual stims. #498 lgtst 2023-03-31 18:34:37 +0100
• a445416d1f draggable passed to constructor for ImageStim.js lgtst 2023-03-31 18:28:07 +0100
• 3854925368 merge with 2023.1.1 lgtst 2023-03-31 18:22:51 +0100
• 5f32881be2 removed dead code. #559 lgtst 2023-03-24 13:23:50 +0000
• bff887b793 src/visual lgtst 2023-03-24 13:20:34 +0000
• e92bb527e8
  Merge pull request #558 from apitiot/2023.1.1 2023.1.3 2023.1.2 2023.1.1 Alain Pitiot 2023-03-23 15:22:48 +0100
• d9f5cfae63 ENH: improved super-flow survey; ENH: release of resources #562 #558 Alain Pitiot 2023-03-23 15:19:08 +0100
• d0c87a4baf
  Merge da52e27ef6 into 941b4425b9 #486 dependabot[bot] 2023-03-13 06:51:12 -0700
• ac10b13b52 Revert "Fix for showing videos on iphones. ServerManager downloads videos and saves them as PIXI.Texture. MovieStim prepared to work with texture resource." #555 lgtst 2023-02-21 18:50:42 +0000
• 4165d81e0c Fix for showing videos on iphones. ServerManager downloads videos and saves them as PIXI.Texture. MovieStim prepared to work with texture resource. lgtst 2023-02-21 18:06:16 +0000
• 3f8304bb75 Fix for showing videos on iphones. ServerManager downloads videos and saves them as PIXI.Texture. MovieStim prepared to work with texture resource. lgtst 2023-02-21 18:06:16 +0000
• dd31fa3346 added styles for consistency of looks between android and iphone. Brighter green background for dialog window title. Vertical height of the dialog window limited to 93% of the parent. lgtst 2023-02-16 01:17:18 +0000
• 39d5abcfbb removed rogue semicolon; lgtst 2023-02-15 00:50:17 +0000
• 7fe7f1707a Reorganized construction of dialog box from dictionary; Added styles to allow for dialog ta fit within the screen and provide scroll when there are lots of expInfo parameters. lgtst 2023-02-14 23:29:05 +0000
• 30c937b213 progress bar component prototype. lgtst 2023-02-13 19:40:22 +0000
• ec3283bb7b
  Merge pull request #552 from apitiot/2023.1.0 2023.1.0 Alain Pitiot 2023-02-02 12:58:57 +0100
• 0c578e26d0 FF: Allow TextBox to accept placeholder as input #552 Alain Pitiot 2023-02-02 12:56:23 +0100
• 61a2f4286a _ Alain Pitiot 2023-02-02 12:49:53 +0100
• f87431e6af ENH: Survey super-flow Alain Pitiot 2023-02-02 12:49:26 +0100
• 33967660ab particle emitter update. Now supports proper initial settings; particles orient themselves in the direction of velocity. lgtst 2023-01-31 07:21:38 +0000
• 9a294f8367 particle system v01. lgtst 2023-01-28 15:42:00 +0000
• c2be1a04ec FF: Allow TextBox to accept "placeholder" as an input #551 Todd Parsons 2023-01-26 12:47:28 +0000
• a074ed34f0 blurfilter for image stim v0; #550 lgtst 2023-01-26 09:45:31 +0000
• 506444f1c6 proper handling of youtubeplayer ready callback. lgtst 2023-01-25 11:59:46 +0000
• a835f24682 added play/pause/stop, draw/hide handling for youtube player. Added temporrary css generation from the script for easier atm customer support; lgtst 2023-01-20 05:26:19 +0000
• da9b892ead ENH: Alias "star" and "star7" #522 Todd Parsons 2023-01-13 14:46:07 +0000
• e5f7bb9ba1 capability to switch between yt and local video source... almost seamlessly, tbd. lgtst 2023-01-13 14:26:23 +0000
• 91ce505e52 saving progress for youtube-able movie stim lgtst 2023-01-12 08:21:14 +0000
• 9ddbfb0df8 added flowComplete callback call; #547 lgtst 2023-01-12 04:22:46 +0000
• 3c7b12be8c attempting to use yt embed player api; lgtst 2023-01-10 15:41:23 +0000
• cd982881c6 v0.1 version of using youtube embeddable player as movie stims. lgtst 2023-01-10 03:32:11 +0000
• 57025709ad
  Merge pull request #549 from apitiot/2022.2.5 2022.2.5 Alain Pitiot 2023-01-05 11:38:26 +0100
• 443dd4c4e5
  Merge pull request #548 from apitiot/2022.3.0 Alain Pitiot 2023-01-05 11:37:19 +0100
• be5292480b _ #549 Alain Pitiot 2023-01-05 11:31:26 +0100
• be2f24f4c5 ENH Survey: better management of vendor libraries #548 Alain Pitiot 2023-01-05 11:29:30 +0100
• 28b204b7b4
  Merge 39fce46e90 into f4da66eb9b #503 Nikita Agafonov 2022-12-19 22:30:42 +0000
• 334b5b7e39
  Upgrade to node version 15 2022.2.4 tpronk 2022-12-13 20:38:50 +0000
• 326b989bbf
  Upgrade node to version 15 tpronk 2022-12-13 19:51:56 +0000
• 941b4425b9
  Upgrade to node 15 tpronk 2022-12-13 19:49:13 +0000
• 7ed1ab208c added node running codes, fixed typos; lgtst 2022-12-13 12:42:06 +0000
• 010a1af623 removed stub datastructure; lgtst 2022-12-13 00:17:15 +0000
• 4528275637 updated functions to run survey flow; lgtst 2022-12-13 00:05:37 +0000
• 70b3ba5b14 new survey runner code, to accomodate new flowmodel; lgtst 2022-12-12 18:03:24 +0000
• 0b9308f841
  Sync up with the version on the main branch tpronk 2022-12-12 16:58:56 +0000
• 49512063a7
  Upgrade to node 15 tpronk 2022-12-12 16:27:36 +0000
• 4e3d11ff6c
  BF: Downgrade node version to 14 tpronk 2022-12-12 16:17:50 +0000
• 90ead545ae proper usage of survey and flow completion callbacks; lgtst 2022-12-12 00:15:07 +0000
• 8c370a3d34 Survey work accumulated for the past months that wasn't possible to commit due to lack of updates to the repo; lgtst 2022-12-10 22:01:31 +0000
• 378ec60de8
  Bump marked and jsdoc #546 dependabot/npm_and_yarn/marked-and-jsdoc-4.2.4 dependabot[bot] 2022-12-09 16:20:02 +0000
• a0da4bd575
  Bump markdown-it and jsdoc #545 dependabot/npm_and_yarn/markdown-it-and-jsdoc-12.3.2 dependabot[bot] 2022-12-09 16:20:01 +0000
• c4c7cd8747
  Update node version to 16 tpronk 2022-12-09 16:19:30 +0000
• 6405c74fcf
  BF OK button enabled only after resources are downloaded Alain Pitiot 2022-12-07 17:00:23 +0100
• c20bbef448
  Merge pull request #544 from lightest/hw_accel_check_improvements Alain Pitiot 2022-11-30 10:52:19 +0100
• 1f6a816fbf wgl fail if perf issues flag moved to setupPixi(); #544 lgtst 2022-11-30 09:49:29 +0000
• 395e7fba41 added checkWebGLSupport flag check in openWindow(); lgtst 2022-11-29 13:24:02 +0000
• 1dc2617028
  Merge pull request #543 from apitiot/2022.3.0 Alain Pitiot 2022-11-29 09:47:51 +0100
• f2e630c3d1 Merge branch '2022.3.0' of github.com:apitiot/psychojs into 2022.3.0 #543 Alain Pitiot 2022-11-29 09:46:29 +0100
• bb36bee542 NF: conditional check for hardware accelerated WebGL support in PsychoJS constructor Alain Pitiot 2022-11-29 09:45:07 +0100
• 7088ee6a1f
  Merge pull request #542 from apitiot/2022.3.0 Alain Pitiot 2022-11-22 14:10:29 +0100
• ac19ad0c19
  Update ServerManager.js #542 #541 Alain Pitiot 2022-11-22 14:04:02 +0100
• bfe046cf13 NF: detect support for WebGL Alain Pitiot 2022-11-22 13:59:58 +0100