tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,271 Commits 5 Branches 0 Tags
8d8b0b2ec01d32b08db634d9cb0dfd29e11ae88e
Commit Graph
1665 Commits
Author SHA1 Message Date
Claire 088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
David Roetzel 9c80b16401 Accept HTTP Message Signatures (RFC9421) (#34814) 2025-06-02 09:27:08 +00:00
Claire 8e409f92fe Merge commit '32b521b7f4055ccd4e59587589c2bed7759537cb' into glitch-soc/merge-upstream 2025-05-31 17:32:57 +02:00
Claire 32b521b7f4 Fix multiple issues in quoted posts hydration (#34864) 2025-05-31 15:20:31 +00:00
Claire c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Claire 064d333620 Fix inconsistent filtering of silenced accounts for other silenced accounts (#34863) 2025-05-30 13:20:51 +00:00
Matt Jankowski f7a3dd0e38 Use config_for for VAPID key storage (#34845) 2025-05-30 07:00:33 +00:00
Claire b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
Darius KazemiandClaire 991796172a Fix NoMethodError in edge case of emoji cache handling (#34749) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-28 09:39:55 +00:00
Claire 086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Matt Jankowski 37c82a3003 Update sidekiq to version 7 (#34745) 2025-05-26 15:32:41 +00:00
Claire 706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
David Roetzel 3acd87419c Update to linzer 0.7 (#34765) 2025-05-23 06:43:02 +00:00
Matt Jankowski f1a6f4333a Remove redis-namespace gem (#34742) 2025-05-21 15:20:17 +00:00
Claire c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
David Roetzel a5a2c6dc7e Add support for FASP data sharing (#34415) 2025-05-16 12:24:02 +00:00
Claire 7cc3d85a72 Merge commit '1b68020331783c365cd5baa696945d0d8bc68f72' into glitch-soc/merge-upstream 2025-05-14 18:44:04 +02:00
Claire 1b68020331 Fix admin dashboard crash on specific Elasticsearch connection errors (#34683) 2025-05-14 14:50:32 +00:00
Claire 49e9a1fe4e Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream 
Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
 2025-05-06 16:30:33 +02:00
Claire 79931bf3ae Merge commit from fork 
* Check scheme in account and post links

* Harden media attachments

* Client-side mitigation

* Client-side mitigation for media attachments
 2025-05-06 15:02:13 +02:00
Claire 8d98d91f33 Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream 2025-05-06 12:06:51 +02:00
Claire 22e2e7f02b Fix crash when likes or shares collections are not inlined, for real (#34619) 2025-05-06 09:51:42 +00:00
Claire 3e5d78cc5b Fix crash when likes or shares collections are not inlined (#34618) 2025-05-06 07:39:26 +00:00
Claire d14d7a5379 Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream 2025-05-05 20:31:48 +02:00
Claire 89cafb01b4 Remove double-query for signed query strings (#34610) 2025-05-05 12:33:31 +00:00
Claire cbaba54e9d Add support for importing embedded self-quotes (#34584) 2025-05-05 08:01:16 +00:00
Claire 68bb158c84 Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream 2025-05-03 18:28:25 +02:00
Claire 3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Jonny Saunders 8b34daf254 Fix: Use strings not symbols to access totalItems in interaction collections (#34594) 2025-05-03 10:37:06 +00:00
Eugen RochkoandClaire 715cbee93d Fix dashboard warning about Elasticsearch index mismatch not showing up (#34567) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-28 13:59:49 +00:00
Claire 9ed6a14d45 Add support for ingesting quote policies (#34479) 2025-04-28 08:48:27 +00:00
Claire ae3b7dd28d Reject incoming QuoteRequest activities (#34480) 2025-04-25 23:28:09 +00:00
Claire dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Claire 7a70d95435 Add warning for Elasticsearch index analyzers mismatch (#34515) 2025-04-25 10:35:11 +00:00
Claire ace0a3d61f Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream 2025-04-21 15:22:22 +02:00
Claire df2611a10f Add initial support for ingesting and verifying remote quote posts (#34370) 2025-04-17 07:45:23 +00:00
Claire 4e6c7fba78 Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream 2025-04-10 17:50:04 +02:00
Claire 678c8dfeec Refactor StatusCacheHydrator (#34414) 2025-04-10 14:34:27 +00:00
Matt Jankowski 4c2f64907b Remove deprecated Import model (#34371) 2025-04-10 12:49:24 +00:00
Claire 99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
Claire dd23ba9c83 Refactor local-URI-to-account resolving (#34349) 2025-04-02 14:44:09 +00:00
David Roetzel e2ef173b82 Refactoring: Move SignatureVerificationError into Mastodon namespace (#34342) 2025-04-02 07:54:29 +00:00
Claire f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire a5eaa95bb2 Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream 2025-03-28 18:48:04 +01:00
David Roetzel 97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Claire c2defe0e4c Change account suspensions to be federated to recently-followed accounts as well (#34294) 2025-03-28 09:20:32 +00:00
Claire 166514d252 Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream 2025-03-27 19:40:04 +01:00
Claire 1326088110 Change AccountReachFinder to consider statuses based on suspension date (#34291) 2025-03-27 13:41:13 +00:00