tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
1927 Commits
Author SHA1 Message Date
ShleeandClaire e0cca5c3ba Fix SignatureParser accepting duplicate parameters in HTTP Signature header (#37375) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-08 10:47:53 +00:00
Essem 5c358ceaf1 Merge pull request #3340 from TheEssem/fix/quote-cw-fallback-md 
Fix quotes with only CWs not having fallback link when posting with other content types
 2026-01-07 21:39:27 +01:00
David Roetzel aa2110025e Fix URI generation for reblogs by accounts with numerical AP ids (#37415) 2026-01-07 15:39:22 +00:00
Claire aa6ec435d2 Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream 2026-01-07 14:53:51 +01:00
Claire 0b1b98c4f2 Merge commit from fork 2026-01-07 14:14:42 +01:00
Claire b1d219afd0 Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream 2026-01-05 18:19:58 +01:00
Claire 82fb2596c7 Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true (#37363) 2026-01-05 15:06:20 +00:00
Claire f711e222dc Fix quotes with CWs but no text not having fallback link (#37361) 2026-01-05 10:35:35 +00:00
Claire 04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
David Roetzel 4e63958914 Federated "featureable in collections" preference (#37298) 2025-12-19 13:44:27 +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
David Roetzel 5e8b8f9c23 Extract interaction policy class (#37277) 2025-12-17 10:12:43 +00:00
Claire db62d70492 Change Wrapstodon switch from feature flag to admin setting (#37273) 2025-12-17 09:47:02 +00:00
Claire 780fefa700 Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream 2025-12-16 18:27:03 +01:00
Claire 550a6d4765 Add wrapstodon to initial state and show wrapstodon sidebar item on load (#37261) 2025-12-16 09:47:18 +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
Nicholas La Roux 09ab2829da Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses (#37243) 2025-12-15 12:57:16 +00:00
David Roetzel 1766616ebc Refactor relation preloading (#37217) 2025-12-15 07:35:46 +00:00
Claire 53617cef5a Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream 2025-12-11 18:05:28 +01:00
Claire addeb28292 Change wrapstodon 2025 to allow unlisted posts in top statuses (#37206) 2025-12-11 16:35:35 +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
Claire 7b8a5d42f1 Remove unused time series details from 2025 annual report (#37187) 2025-12-10 11:02:24 +00:00
Claire 315f5e5a31 Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream 2025-12-09 18:06:56 +01:00
Matt Jankowski ac71771d98 Fix misc comment typos (#37183) 2025-12-09 16:09:01 +00:00
Claire 2f6cdd6d47 Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream 2025-12-05 20:00:40 +01:00
Echo 007ae588d8 Fix incorrect date for Wrapstodon start (#37138) 2025-12-05 14:12:26 +00:00
Claire 9b851616fe Remove more unused data from 2025 annual reports (#37134) 2025-12-05 13:36:37 +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
Echo 0dac31dfd5 Create new entrypoint for sharable Wrapstodon (#37121) 2025-12-04 15:48:10 +00:00
Claire 88aed3c11a Fix streamed quoted polls not being hydrated correctly (#37118) 2025-12-04 14:10:48 +00:00
Claire 5d84957117 Add shareable wrapstodon links (#37047) 2025-12-03 11:00:41 +00:00
Claire f8422e1fa4 Add API for on-demand generation of annual reports (#37055) 2025-12-02 13:37:05 +00:00
Claire 99ff59b7b2 Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream 2025-11-30 17:47:27 +01:00
Claire 801672e3cb Add method to quickly test for AnnualReport account eligibility (#37045) 2025-11-28 16:19:23 +00:00
Claire 945ef5a8e1 Remove unused data from 2025 annual reports (#37033) 2025-11-28 08:58:34 +00:00
Claire 868d45df2f Merge commit 'ca53195b31ef7eb9205f879e022b09b28efc9314' into glitch-soc/merge-upstream 2025-11-25 18:22:48 +01:00
Claire 204143becc Increase HTTP read timeout for expensive S3 batch delete operation (#37004) 2025-11-25 10:18:34 +00:00
Claire b76530a7f1 Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream 2025-11-24 19:08:03 +01:00
Claire 96d5e57351 Revert "Increase HTTP read timeout for expensive S3 batch delete operation (#36971)" (#36996) 2025-11-24 13:33:37 +00:00
Claire 652ed7ab50 Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream 2025-11-21 19:33:14 +01:00
Claire a54334b714 Increase HTTP read timeout for expensive S3 batch delete operation (#36971) 2025-11-21 08:59:07 +00:00
Claire dd7d750f5d Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream 2025-11-20 18:13:37 +01:00
Claire a28f1d0110 Fix missing fallback link in CW-only quote posts (#36963) 2025-11-20 10:08:36 +00:00
Claire 9525134c28 Merge commit '7e7f63a2efc83edd7c59a12e55eaab9509a4c15b' into glitch-soc/merge-upstream 2025-11-12 18:11:41 +01:00
Claire ed3710e58f Fix Update importing old previously-unknown activities and treating them as recent ones (#36848) 2025-11-12 16:09:00 +00:00
Claire 58b29be439 Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream 2025-11-06 12:35:04 +01:00
Oneric c0c6f5ea32 Fix Accept headers when fetching AP objects to match spec (#30354) 2025-11-05 13:32:29 +00:00
Claire a7ba4ba446 Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream 2025-11-04 20:38:24 +01:00
Matt Jankowski 337f16d33e Remove unused DomainControlHelper include from SignedRequest (#35856) 2025-11-04 15:27:42 +00:00