erik · he/him

0 followers · 0 following

• Joined on 2022-07-07

Repositories

6

Projects Packages Public activity Starred repositories

2

erik pushed to deploy at teh/mastodon 2025-03-06 18:38:06 -08:00

41b27fec08 Merge remote-tracking branch 'refs/remotes/origin/deploy' into deploy

4de2b82da2 Merge remote-tracking branch 'localupstream/434' into deploy

c1f398ae93 Bump version to v4.3.4

19b3469c29 Change HTML sanitization to remove unusable and unused embed tag (#34021)

57e4232b3e Update dependency uri

Compare 40 commits »

erik pushed to deploy at teh/mastodon 2025-03-06 18:35:52 -08:00

fe3e4132b1 Bump version to v4.3.4

3ee0f7e932 Change HTML sanitization to remove unusable and unused embed tag (#34021)

b1546e931e Update dependency uri

e8d576fde2 Merge commit from fork

9bf53cec50 Merge commit from fork

Compare 38 commits »

erik pushed to deploy at teh/mastodon 2025-02-02 21:13:41 -08:00

1b2f05ab88 Hard reset back to pure 4.3.3 release, then patch the 5000 char limit back in

erik pushed to deploy at teh/mastodon 2025-02-02 20:17:53 -08:00

bde90be227 Merge remote-tracking branch 'localupstream/433' into deploy

faed9bf9f1 Bump version to v4.3.3

10f10844ff Update dependencies rails and rails-html-sanitizer

5c8d2be23b Fix libyaml missing from Dockerfile build stage (#33591)

90072f4367 Fix incorrect relationship_severance_event attribute name in changelog (#33443)

Compare 3046 commits »

erik pushed to deploy at teh/mastodon 2025-02-02 19:58:07 -08:00

de67f096f9 Merge branch 'deploy' of ssh://tea.entar.net:2222/teh/mastodon into deploy

979079c774 Merge branch 'deploy' of ssh://tea.entar.net:2222/teh/mastodon into deploy

62967ae462 I added a swap file here. Don't ask.

Compare 3 commits »

erik synced commits to refs/pull/30369/merge at erik/mastodon from mirror 2024-07-31 21:53:55 -07:00

c7748cfbc4 Merge 349e961375 into a50c8e951f

349e961375 Move @typescript-eslint packages to typescript-eslint v8

Compare 2 commits »

erik synced commits to refs/pull/30369/head at erik/mastodon from mirror 2024-07-31 21:53:54 -07:00

349e961375 Move @typescript-eslint packages to typescript-eslint v8

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

549ab089ee Change grouped notifications API shape (take 2) (#31214)

288961bbb9 Change private mention icon for consistency in grouped notifications (#31223)

Compare 15 commits »

erik synced new reference i18n/crowdin/translations to erik/mastodon from mirror 2024-07-31 21:53:53 -07:00

erik synced commits to i18n/crowdin/translations at erik/mastodon from mirror 2024-07-31 21:53:52 -07:00

erik synced commits to refs/pull/31217/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

e1a76112a0 Merge f134634230 into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31213/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

14dfd8cd94 Merge 4000d1aeca into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31211/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

2cb52d5697 Merge f27c1a587d into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31210/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

f9c762ecc4 Merge f344c4d0ff into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31209/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

9a957f3d0a Merge af680ea880 into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31203/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

ed5b838d3e Merge ae630e0109 into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31202/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

1ccd2452a5 Merge ef87fb8a5d into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31194/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

bf3dde8cf6 Merge 37ecb31e17 into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31193/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

6c7406356d Merge 8df188887c into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31190/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

3907bdd92b Merge 7ac3053673 into a50c8e951f

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 3 commits »

erik synced commits to refs/pull/31173/merge at erik/mastodon from mirror 2024-07-31 13:43:39 -07:00

fce2946711 Merge d01a0c8146 into a50c8e951f

d01a0c8146 fix(deps): update dependency @reduxjs/toolkit to v2.2.7

a50c8e951f Fix issue with grouped notifications UI due to recent API change (#31224)

2c1e75727d Change filtered notification banner design to take up less space (#31222)

Compare 4 commits »