Commit Graph - trix - Gitea: Git with a cup of tea

GitHub/trix

Fork 0

mirror of https://github.com/basecamp/trix.git synced 2026-05-17 12:00:38 +00:00

Commit Graph

Select branches

Hide Pull Requests

1-3-stable

1.3.5

apply-block-attributes-to-expanded-selections

block-attribute-class-name

bug+safari-autocomplete

coffeescript2

control-element

custom-elements-v1

dependabot/github_actions/github-actions-6d6bc9314b

dependabot/npm_and_yarn/npm-4228a08b10

firefox-version

fix-ie11-mutation-summary

fix-multipart-clipboard-data-with-file

inline-html-attachments

main

object-archive

old

rollup-with-global

safari-smart-quotes-cursor-fix

sanitize-trix-attachment

sync-with-patch

update-browser-versions

update-readme

v2-with-dist

#1

#1

#1000

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#1012

#1016

#1018

#1019

#1021

#1024

#1025

#1026

#1029

#1030

#1036

#1037

#1040

#1041

#1042

#1043

#1043

#1047

#1049

#1051

#1052

#1056

#1058

#1060

#1065

#1067

#1067

#1068

#107

#1070

#1071

#1072

#1074

#1076

#1079

#108

#108

#1081

#1081

#1083

#1089

#1089

#1090

#1091

#1093

#1095

#1098

#1099

#1102

#1105

#1105

#1107

#1107

#1110

#1110

#1112

#1114

#1114

#1115

#1118

#112

#1121

#1121

#1122

#1122

#1123

#1126

#1127

#1128

#1129

#113

#1130

#1131

#1132

#1135

#1135

#1136

#1138

#1140

#1144

#1146

#1147

#1148

#1149

#1151

#1153

#1156

#1157

#116

#1161

#1162

#1165

#1172

#1172

#1177

#1179

#1183

#1183

#1188

#1189

#1190

#1191

#1192

#1193

#1194

#1196

#1197

#1197

#1198

#1199

#1201

#1203

#1204

#1205

#1206

#1208

#1210

#1211

#1212

#1213

#1214

#1215

#1216

#1218

#1220

#1226

#1226

#1227

#1232

#1234

#1235

#1239

#1246

#1249

#1252

#1253

#1255

#1256

#1257

#1258

#1260

#1261

#1261

#1262

#1263

#1264

#1264

#1265

#1269

#1270

#1271

#1272

#1273

#1275

#1276

#1278

#1279

#1280

#1282

#1283

#1283

#1284

#1285

#1286

#1287

#1288

#1289

#1290

#1291

#1292

#1293

#1294

#1294

#1295

#1297

#1299

#1300

#1301

#1305

#1306

#1307

#1308

#1309

#131

#1310

#1311

#1312

#1313

#1314

#1314

#1315

#1315

#134

#14

#143

#143

#145

#145

#146

#146

#15

#154

#160

#161

#162

#163

#164

#166

#166

#168

#169

#169

#17

#175

#18

#183

#183

#184

#184

#187

#187

#188

#188

#19

#192

#192

#197

#2

#20

#203

#21

#210

#214

#214

#215

#22

#220

#222

#222

#223

#223

#224

#225

#23

#230

#234

#234

#235

#236

#236

#238

#238

#24

#240

#240

#241

#242

#243

#244

#25

#26

#260

#263

#266

#266

#268

#27

#278

#280

#292

#292

#294

#295

#295

#296

#296

#297

#299

#3

#301

#312

#317

#32

#32

#321

#323

#325

#338

#339

#34

#34

#341

#342

#349

#355

#364

#366

#366

#369

#371

#371

#380

#381

#381

#390

#390

#4

#400

#400

#404

#404

#409

#412

#414

#414

#426

#429

#429

#43

#43

#431

#431

#434

#435

#438

#438

#439

#445

#448

#450

#468

#473

#473

#474

#486

#487

#491

#491

#492

#5

#5

#502

#51

#51

#516

#523

#526

#527

#531

#532

#534

#536

#541

#541

#544

#545

#545

#546

#547

#548

#550

#550

#556

#56

#56

#560

#564

#580

#59

#59

#6

#603

#615

#617

#619

#629

#65

#65

#650

#66

#670

#69

#69

#697

#698

#7

#7

#704

#709

#712

#714

#715

#718

#727

#729

#730

#732

#735

#737

#738

#742

#751

#753

#772

#773

#781

#782

#789

#789

#790

#791

#791

#792

#793

#796

#806

#814

#819

#824

#825

#829

#83

#830

#834

#836

#838

#839

#840

#841

#842

#843

#847

#855

#855

#856

#861

#862

#879

#88

#896

#897

#899

#90

#90

#910

#926

#927

#928

#929

#930

#931

#933

#934

#935

#936

#937

#938

#94

#944

#945

#946

#946

#949

#95

#95

#950

#951

#955

#956

#957

#959

#960

#965

#967

#968

#969

#971

#978

#981

#983

#988

#989

#99

#99

#990

#992

#994

#995

0.10.0

0.10.1

0.10.2

0.11.0

0.11.1

0.11.2

0.11.3

0.11.4

0.12.0

0.12.1

0.4.0

0.5.0

0.6.0

0.7.0

0.8.0

0.9.0

0.9.1

0.9.10

0.9.2

0.9.3

0.9.4

0.9.5

0.9.6

0.9.7

0.9.8

0.9.9

1.0.0

1.1.0

1.1.1

1.2.0

1.2.1

1.2.2

1.2.3

1.2.4

1.3.0

1.3.1

1.3.2

1.3.3

1.3.4

1.3.5

2.1.3

v2.0.0

v2.0.0-alpha.0

v2.0.0-alpha.1

v2.0.0-beta.0

v2.0.0-beta.1

v2.0.1

v2.0.10

v2.0.2

v2.0.3

v2.0.4

v2.0.5

v2.0.6

v2.0.7

v2.0.8

v2.0.9

v2.1.0

v2.1.1

v2.1.10

v2.1.11

v2.1.12

v2.1.13

v2.1.14

v2.1.15

v2.1.16

v2.1.17

v2.1.18

v2.1.19

v2.1.2

v2.1.4

v2.1.5

v2.1.6

v2.1.7

v2.1.8

v2.1.9

c86bc0ead9 Bump the npm group with 17 updates dependabot/npm_and_yarn/npm-4228a08b10 dependabot[bot] 2026-05-16 05:55:46 +00:00
5c9be7c0ce Bump the github-actions group with 2 updates dependabot/github_actions/github-actions-6d6bc9314b dependabot[bot] 2026-05-16 05:52:46 +00:00
23ab2f6504 v2.1.19 main v2.1.19 Mike Dalessio 2026-05-09 12:48:30 -04:00
6ba31fea45 Bump js-yaml from 3.14.1 to 3.14.2 (#1313) dependabot[bot] 2026-05-09 12:40:59 -04:00
644a02c880 dep: upgrade rangy to 1.3.2 (#1312) Mike Dalessio 2026-05-09 12:23:31 -04:00
a7c0e0945e Bump qs from 6.14.0 to 6.15.1 (#1311) dependabot[bot] 2026-05-09 12:21:07 -04:00
ce80a5ef31 dep: upgrade DOMPurify to 3.4.2 from 3.2.7 (#1310) Mike Dalessio 2026-05-09 12:15:56 -04:00
50c5d4fecd Bump @babel/plugin-transform-modules-systemjs from 7.23.9 to 7.29.4 (#1308) dependabot[bot] 2026-05-09 11:47:07 -04:00
95addeb72a Bump lodash from 4.17.21 to 4.18.1 (#1295) dependabot[bot] 2026-05-09 11:44:51 -04:00
c76aeb707f Bump immutable from 5.1.3 to 5.1.5 (#1292) dependabot[bot] 2026-05-09 11:44:43 -04:00
f325978dc0 Bump ip-address from 10.1.0 to 10.2.0 (#1307) dependabot[bot] 2026-05-09 11:43:09 -04:00
d014617094 Bump basic-ftp from 5.0.5 to 5.2.2 (#1299) dependabot[bot] 2026-05-09 11:41:12 -04:00
cef0e47e67 Bump the github-actions group across 1 directory with 5 updates (#1306) dependabot[bot] 2026-05-09 11:38:35 -04:00
e24703d02a Bump svgo from 2.8.0 to 2.8.2 (#1289) dependabot[bot] 2026-05-09 11:37:08 -04:00
8ebedf23e1 Bump flatted from 3.2.9 to 3.4.2 (#1291) dependabot[bot] 2026-05-09 11:37:00 -04:00
17df7ea504 dep: minitest 6 is now supported by rails (#1309) Mike Dalessio 2026-05-09 11:35:55 -04:00
1c6a6998b7 Bump rollup from 2.79.1 to 2.80.0 (#1290) dependabot[bot] 2026-05-09 11:34:40 -04:00
da8869922e v2.1.18 v2.1.18 Mike Dalessio 2026-03-26 18:15:26 -04:00
9c0a993d9f Fix XSS via javascript: URI in JSON drag-drop deserialization (#1293) Mike Dalessio 2026-03-26 18:08:38 -04:00
e62fcc3b58 ci: harden GitHub Actions workflows (#1284) Mike Dalessio 2026-03-20 19:34:00 -04:00
2e46d5128f v2.1.17 v2.1.17 Mike Dalessio 2026-03-11 14:11:48 -04:00
53197ab5a1 Merge pull request #1282 from basecamp/h1-3581911-serialized-attr Mike Dalessio 2026-03-11 14:04:14 -04:00
3229c29c77 Fix stored XSS via data-trix-serialized-attributes sanitizer bypass (H1 #3581911) Mike Dalessio 2026-03-11 13:38:41 -04:00
7069343612 Merge pull request #1239 from Cromian/patch-1 Mike Dalessio 2026-03-03 09:16:47 -05:00
d9dbf0a27e Merge pull request #1280 from basecamp/fix-bullets-merging-with-prior-element Mike Dalessio 2026-03-03 09:11:14 -05:00
bef13e2787 Fix bullets merging with prior elements when the first node is removed Stanko K.R. 2026-02-27 20:58:20 +01:00
194a36c5e8 Merge pull request #1275 from basecamp/flavorjones/wtr-failure-messages Mike Dalessio 2026-01-09 13:06:29 -05:00
c94abe6005 Use source-map to get better test failure messages Mike Dalessio 2026-01-09 12:22:38 -05:00
6f6ab9ac83 Test runner reporter emits failure details Mike Dalessio 2026-01-09 12:16:37 -05:00
1d2d1a3b1a Merge pull request #1276 from basecamp/flavorjones/ci-green-20260109 Mike Dalessio 2026-01-09 12:58:53 -05:00
2a8dbccd5c Update the copyright in trix.js Mike Dalessio 2026-01-09 12:51:51 -05:00
e31aae79e7 Add Ruby 4 to the testing matrix Mike Dalessio 2026-01-09 12:51:40 -05:00
ca6601633e Get downstream Rails tests passing again Mike Dalessio 2026-01-09 12:51:05 -05:00
36a2c894ae ci: enable workflow dispatch via the UI Mike Dalessio 2026-01-09 12:34:35 -05:00
32b10829e4 Merge pull request #1272 from basecamp/flavorjones/replace-karma-with-wtr Mike Dalessio 2026-01-03 12:59:26 -05:00
c20a85d369 Add test progress reporting in local dev Mike Dalessio 2025-12-31 11:48:03 -05:00
4df5db69a1 Restore Android browser testing to Sauce Labs configuration Mike Dalessio 2025-12-31 10:28:41 -05:00
bf3890805a Replace Karma with @web/test-runner Mike Dalessio 2025-12-19 22:25:49 -05:00
5c8b688fa3 v2.1.16 v2.1.16 Mike Dalessio 2025-12-30 14:37:23 -05:00
73c20cf03a Fix XSS vulnerability in attachment href rendering Mike Dalessio 2025-12-13 14:54:37 -05:00
07a5e47f67 Make "yarn version" commit changes to the ruby gem, too Mike Dalessio 2025-12-30 14:32:56 -05:00
17715149d5 Merge pull request #1271 from basecamp/flavorjones/ci-sauce-labs Mike Dalessio 2025-12-19 15:52:16 -05:00
04f803ed4b ci: stabilize Sauce Labs with SC5 tunnel Mike Dalessio 2025-12-19 15:41:44 -05:00
93f5270c39 Merge pull request #1270 from basecamp/flavorjones/fix-minitest-errors Mike Dalessio 2025-12-19 13:27:03 -05:00
31045c96af action_text-trix: pin minitest to < 6 Mike Dalessio 2025-12-19 13:10:12 -05:00
13eebdad4a yarn build Mike Dalessio 2025-12-19 10:20:26 -05:00
696643d7c2 Merge pull request #1269 from basecamp/flavorjones/revert-mousedown-click-change Mike Dalessio 2025-12-19 10:18:43 -05:00
42f69dd4c2 Revert "Toolbar Button: Handle click instead of mousedown" Mike Dalessio 2025-12-15 18:53:10 -05:00
64afb411c9 Merge pull request #1265 from basecamp/rails-8-1-ci-matrix Mike Dalessio 2025-12-15 18:39:24 -05:00
6f4c3efe09 Add 8-1-stable branch to CI matrix Sean Doyle 2025-11-01 21:15:00 -04:00
1aa6c54a6a Merge pull request #1263 from seanpdoyle/fix-action_text-trix-assets Jorge Manrubia 2025-11-03 06:11:03 +01:00
835d7d58b9 Fix stale app/assets/javascripts/trix.js file Sean Doyle 2025-11-01 19:11:27 -04:00
3a09fb9e7f Merge pull request #1262 from basecamp/flavorjones/fix-ci Mike Dalessio 2025-10-14 14:25:04 -04:00
43849b6d71 ci: Make sure continue-on-error is always valid Mike Dalessio 2025-10-14 14:21:07 -04:00
00fe52e01b ci: Try to fix the apt-install errors Mike Dalessio 2025-10-14 14:09:44 -04:00
e7fe45eb46 Merge pull request #1258 from seanpdoyle/rails-engine-test-coverage Mike Dalessio 2025-10-14 14:11:13 -04:00
4293d34b88 action_text-trix: Add test coverage for Engine Sean Doyle 2025-09-26 10:17:58 -04:00
50bac545fe Merge pull request #1210 from seanpdoyle/issue-1154 Jorge Manrubia 2025-10-08 13:46:08 +02:00
092910bf5d Merge pull request #1198 from seanpdoyle/attachment-preview-alt Jorge Manrubia 2025-10-08 13:44:47 +02:00
512929f1fe Merge pull request #1127 from seanpdoyle/trix-toolbar-editorElement-property Jorge Manrubia 2025-10-08 13:42:20 +02:00
8ef987e465 Merge pull request #1201 from seanpdoyle/toolbar-button-click Jorge Manrubia 2025-10-08 13:41:09 +02:00
9977bdb817 Merge pull request #1260 from basecamp/document-trix-attachment-edit Jorge Manrubia 2025-10-08 13:35:29 +02:00
32165b82c7 Safari: fix incorrect cursor position after smart quote insertion safari-smart-quotes-cursor-fix Jeremy Daer 2025-10-03 14:56:08 -07:00
86ab7d0a8f Document trix-attachment-edit in README.md Sean Doyle 2025-10-03 13:36:32 -04:00
b307451a79 Merge pull request #1162 from MatheusRich/patch-1 Mike Dalessio 2025-09-27 11:49:49 -04:00
b5d39c290c Merge branch 'main' into patch-1 Sean Doyle 2025-09-26 12:55:06 -04:00
088e4f8164 Support setting img[alt] on ManagedAttachment Sean Doyle 2024-11-15 11:59:44 -05:00
1f5ee5e8da Toolbar Button: Handle click instead of mousedown Sean Doyle 2024-12-03 10:36:05 -05:00
2decc52042 Customize Attachment Preview URL Sean Doyle 2024-12-10 15:38:17 -05:00
552aef65f8 Define TrixToolbarElement.editorElements property Sean Doyle 2024-01-21 13:24:54 -05:00
fee2e50f19 Merge pull request #1253 from basecamp/editor-preload-content Jorge Manrubia 2025-09-26 18:24:06 +02:00
50a07243b7 Merge pull request #1256 from basecamp/action_text-trix Mike Dalessio 2025-09-26 12:00:36 -04:00
0403d53fdd Build action_text-trix assets with existing tools Sean Doyle 2025-09-26 09:55:35 -04:00
c02eb604a9 Read initial editor value from HTML content Sean Doyle 2024-02-07 12:20:07 -05:00
e3d72b393f Merge pull request #1257 from seanpdoyle/package-json-node-version Mike Dalessio 2025-09-26 11:48:46 -04:00
f39ca75f66 Merge pull request #1255 from seanpdoyle/fix-ci Mike Dalessio 2025-09-26 11:45:58 -04:00
cc598f869b Update .node-version and engine property in package.json Sean Doyle 2025-09-26 10:55:38 -04:00
6d3f1c5e6c Pass CI Sean Doyle 2025-09-21 23:05:25 -04:00
62b1483527 Merge pull request #1128 from seanpdoyle/element-internals Jorge Manrubia 2025-09-21 18:09:25 +02:00
fc15ab2c82 Merge pull request #1252 from seanpdoyle/editor-render Jorge Manrubia 2025-09-21 18:00:05 +02:00
69d8d753ab Dispatch trix-before-render event Sean Doyle 2024-02-07 12:20:07 -05:00
85d1ed26f0 ElementInternals: Support without <input> element Sean Doyle 2024-02-07 12:20:07 -05:00
379943ca5e Update README.md Misha 2025-06-17 12:34:10 -04:00
55ef9be329 Merge pull request #1235 from basecamp/flavorjones/rails-integration-tests Mike Dalessio 2025-05-13 17:44:32 -04:00
5c8ef0a9f4 ci: integration test with Action Text Mike Dalessio 2025-05-13 17:41:05 -04:00
84ff7f1673 ci: improve the pipeline Mike Dalessio 2025-05-13 17:40:03 -04:00
69c6664397 Enable "mfa required" for the ruby gem Mike Dalessio 2025-05-13 08:52:48 -04:00
2204b69fbc Fix the name of the rake task used to release ruby. Mike Dalessio 2025-05-13 08:39:22 -04:00
213cb1d0ed Merge pull request #1234 from basecamp/flavorjones/package-in-ruby-gem Mike Dalessio 2025-05-13 08:37:43 -04:00
899415135d Update build and release tasks to include the Ruby gem Mike Dalessio 2025-05-13 08:17:50 -04:00
51782257fb Create a ruby gem package Mike Dalessio 2025-05-10 15:26:20 -04:00
5f8d56dca6 v2.1.15 v2.1.15 Donal McBreen 2025-05-08 10:20:12 +01:00
7522608964 Merge commit from fork Donal McBreen 2025-05-08 08:11:38 +01:00
5f61df05e6 Use SAFE_FOR_XML for pasted content Donal McBreen 2025-05-05 15:22:03 +01:00
2d72f93ed5 v2.1.14 v2.1.14 Donal McBreen 2025-04-29 12:46:00 +02:00
09ecead6dd Merge pull request #1232 from jakeonrails/jakeonrails/update-dompurify-to-3.2.5-to-fix-#1231 Mike Dalessio 2025-04-29 06:37:52 -04:00
447c001ab3 Bump dompurify to 3.2.5 to resolve security issue Jake Moffatt 2025-04-24 15:37:52 -07:00
1e214a7443 v2.1.13 v2.1.13 Jorge Manrubia 2025-03-10 11:25:34 +01:00
ca6de49255 Merge pull request #1227 from basecamp/morphing Jorge Manrubia 2025-03-10 11:17:10 +01:00
23299417aa Remove iOS latest since it's failing on Solano Jorge Manrubia 2025-03-06 16:51:09 +01:00

1 2 3 4 5 ...