tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,384 Commits 5 Branches 0 Tags
Commit Graph

3213 Commits

Author SHA1 Message Date
Claire
2ebf6d60a6 Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Conflict because of an extra dependency in glitch-soc.
  Updated upstream's dependencies as upstream did.
 2026-01-03 16:05:35 +01:00
renovate[bot]
628cbd2999
Update dependency postcss-preset-env to v10.6.0 (#37353) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 14:38:34 +00:00
renovate[bot]
37eb1ec84c
Update dependency bufferutil to v4.1.0 (#37309) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:44:14 +00:00
renovate[bot]
b2c0e0c5a7
Update dependency utf-8-validate to v6.0.6 (#37308) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:38:08 +00:00
renovate[bot]
0afe85e967
Update dependency jsdom to v27.4.0 (#37349) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 13:03:49 +00:00
renovate[bot]
0f55bb6735
Update dependency sass to v1.97.1 (#37328) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-02 11:08:48 +00:00
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
renovate[bot]
06a5199c44
Update dependency storybook to v10.1.10 [SECURITY] (#37314) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-19 13:41:58 +00:00
renovate[bot]
77b685e749
Update dependency vite-tsconfig-paths to v6.0.3 (#37303) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-19 10:07:44 +00:00
renovate[bot]
6480e16c17
Update dependency sass to v1.97.0 (#37266) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-19 08:13:07 +00:00
Claire
84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
 2025-12-17 18:27:14 +01:00
renovate[bot]
42d4753d30
Update dependency vite-tsconfig-paths to v6.0.2 (#37279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-17 13:15:05 +00:00
Claire
780fefa700 Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream 2025-12-16 18:27:03 +01:00
Matt Jankowski
c8f608839b
Use bundler version 4.0.1 (#37191) 2025-12-16 10:13:43 +00:00
renovate[bot]
4c679c698f
Update dependency vite-tsconfig-paths to v6 (#37247) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-16 09:46:39 +00:00
Claire
1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.
 2025-12-15 20:22:20 +01:00
renovate[bot]
2984f377e8
Update devDependencies (non-major) (#37074) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-12-15 12:53:21 +00:00
renovate[bot]
d7f632f6ba
Update dependency tesseract.js to v7 (#37246) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-15 12:07:57 +00:00
renovate[bot]
372de345d7
Update dependency sass to v1.96.0 (#37175) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-15 08:03:45 +00:00
Claire
53617cef5a Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream 2025-12-11 18:05:28 +01:00
renovate[bot]
fed26a41fa
Update dependency jsdom to v27.3.0 (#37165) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-11 10:33:47 +00:00
renovate[bot]
15c9088761
Update dependency vite to v7.2.7 (#37156) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-11 10:07:38 +00:00
renovate[bot]
da1505a495
Update dependency @vitejs/plugin-react to v5.1.2 (#37155) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-11 10:07:30 +00:00
Claire
17ba99e5de Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict because of glitch-soc's theming change.
  Adapted upstream's changes.
- `docker-compose.yml`:
  Conflict because of container repo name change.
  Adapted upstream's changes.
- `yarn.lock`:
  Conflict because of an additional glitch-soc dependency.
  Updated the dependencies upstream did.
 2025-12-10 18:05:44 +01:00
renovate[bot]
37426288d9
Update dependency postcss-preset-env to v10.5.0 (#37132) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-10 12:53:39 +00:00
Claire
2f6cdd6d47 Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream 2025-12-05 20:00:40 +01:00
renovate[bot]
d895ea3433
Update dependency vite to v7.2.6 (#37076) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-05 09:20:45 +00:00
renovate[bot]
49105a28a3
Update eslint (non-major) (#36801) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-05 09:20:34 +00:00
renovate[bot]
1cb650d107
Update dependency jsdom to v27.2.0 (#36845) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-05 09:20:17 +00:00
Claire
c8f365fd1d Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream 2025-12-04 20:59:54 +01:00
Claire
34aa825e96 Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream 2025-12-04 20:16:21 +01:00
renovate[bot]
baef5b1659
Update dependency @optimize-lodash/rollup-plugin to v6 (#37062) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-04 09:16:13 +00:00
renovate[bot]
e222664539
Update DefinitelyTyped types (non-major) (#37073) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-03 11:17:01 +00:00
renovate[bot]
f393ff93cb
Update dependency @optimize-lodash/rollup-plugin to v5.1.0 (#37039) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-02 13:45:33 +00:00
renovate[bot]
9c3b41f0a4
Update dependency vite-plugin-pwa to v1.2.0 (#37040) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-02 13:45:27 +00:00
renovate[bot]
e45ecc7d13
Update dependency express to v5.2.0 [SECURITY] (#37089) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-12-02 13:43:46 +00:00
Claire
99ff59b7b2 Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream 2025-11-30 17:47:27 +01:00
Claire
44e6abe48b Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream 2025-11-30 16:40:18 +01:00
Echo
0d2e9522ff
Replace Rails UJS library (#37031) 2025-11-27 13:10:55 +00:00
Claire
868d45df2f Merge commit 'ca53195b31ef7eb9205f879e022b09b28efc9314' into glitch-soc/merge-upstream 2025-11-25 18:22:48 +01:00
renovate[bot]
4ca458e0b4
chore(deps): update devdependencies (non-major) (#36802) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-25 13:53:23 +00:00
renovate[bot]
ca53195b31
chore(deps): update dependency sass to v1.94.2 (#36826) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-25 13:21:25 +00:00
Claire
652ed7ab50 Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream 2025-11-21 19:33:14 +01:00
renovate[bot]
687f3a2a01
chore(deps): update dependency vite to v7.2.4 (#36964) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-21 11:00:29 +00:00
renovate[bot]
aa131e538c
chore(deps): update dependency core-js to v3.47.0 (#36931) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-21 09:17:57 +00:00
Claire
dd7d750f5d Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream 2025-11-20 18:13:37 +01:00
Claire
7a56972381 Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream 2025-11-19 21:49:09 +01:00
Claire
bc7c83ba76
Update glob dependency (#36940) 2025-11-19 15:28:57 +00:00
renovate[bot]
04bdfa1957
chore(deps): update dependency @vitejs/plugin-react to v5.1.1 (#36841) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-11-17 14:12:38 +00:00
Claire
e0d7230f97 Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream 2025-11-14 18:19:00 +01:00