Claire
2c35e71cfc
Merge commit '38e7bb9b866b5d207a511de093de25536f13e9c4' into glitch-soc/merge-4.5
2026-03-24 16:17:23 +01:00
Claire
089a141efc
Merge commit from fork
2026-03-24 15:44:08 +01:00
Matt Jankowski
23be60a641
Update devise to version 5.0 ( #37419 )
2026-03-24 15:36:06 +01:00
Claire
f4baed2a69
Merge commit 'f37dc6c59e88aa3a119ecbe76ee9fba480d13daa' into glitch-soc/merge-4.5
2026-03-14 11:54:20 +01:00
Matt Jankowski
f37dc6c59e
Normalize current_username on account migration ( #38183 )
2026-03-13 18:17:18 +01:00
Claire
c14a62c3af
Merge commit 'd7059dcf1c5fb4dcebd80e8033a455917d0a21d1' into glitch-soc/merge-4.5
2026-03-09 12:56:25 +01:00
Claire
d7059dcf1c
Fix poll expiration notification being re-triggered on implicit updates ( #38078 )
2026-03-09 11:39:36 +01:00
Claire
a7bfcf7131
Redirect to short account URLs when requesting HTML for one of the AP endpoints ( #38056 )
2026-03-09 11:39:36 +01:00
Claire
f198ec7c1c
Fix existing posts not being removed from lists when a list member is unfollowed ( #38048 )
2026-03-09 11:39:36 +01:00
Claire
d609819aa7
Merge commit 'ab872f28b9ff8f09026461ed4874070f4e62be84' into glitch-soc/merge-4.5
2026-02-24 14:59:35 +01:00
Matt Jankowski
1103ebdc55
Capture output in cli/emoji spec ( #37861 )
2026-02-24 10:35:40 +01:00
Claire
4046affea9
Merge commit '96a96a79caeaddf4ce07c3d0468332902b00eab2' into glitch-soc/merge-4.5
2026-02-23 18:55:36 +01:00
Claire
9c927683db
Add --suspended-only option to tootctl emoji purge ( #37828 )
2026-02-23 18:41:43 +01:00
Claire
fbbf8b9a8c
Process actor public keys when they are in a separate document without the ActivityStreams context ( #37826 )
2026-02-23 18:41:43 +01:00
Claire
b7e34ade1d
Purge custom emojis on domain suspension ( #37808 )
2026-02-23 18:41:43 +01:00
Claire
31316aa082
Fix processing of object updates with duplicate hashtags ( #37756 )
2026-02-23 18:41:43 +01:00
David Roetzel
27c1e13aa8
Reject unconfirmed FASPs ( #37926 )
2026-02-20 16:29:35 +01:00
David Roetzel
17c04fe04b
Re-use custom socket class for FASP requests ( #37925 )
2026-02-20 16:29:35 +01:00
Claire
ffddcc7c1d
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji
...
Deprecate eye emoji in favor of a bespoke API parameter
2026-02-11 20:24:07 +01:00
Claire
a1e0fbfb67
Merge commit '68a26ce7c650ac2140c295b52f78b3d08191d6bd' into glitch-soc/merge-4.5
2026-01-30 18:19:44 +01:00
Claire
569ff6c8ad
Fix error when encountering invalid tag in updated object ( #37635 )
2026-01-29 14:55:25 +01:00
Claire
dcc5c2b6f6
Fix cross-server conversation tracking ( #37559 )
2026-01-29 14:55:25 +01:00
Claire
ada1d32394
Merge commit 'db943c43c8fe834a0db6e87c020783ecf42476a9' into glitch-soc/merge-4.5
2026-01-20 15:56:06 +01:00
Claire
1b3ef035b9
Merge commit from fork
2026-01-20 15:10:38 +01:00
Claire
c96eebde37
Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream refactored a bit where we had an extra argument for markdown/HTML.
Adapted upstream change.
2026-01-19 18:29:02 +01:00
Matt Jankowski
f1c9c89c39
Add spec for quote policy update change ( #37474 )
2026-01-19 11:37:34 +01:00
David Roetzel
deeaf50472
Fix URI generation for reblogs by accounts with numerical AP ids ( #37415 )
2026-01-19 11:37:34 +01:00
Claire
b5d868018d
Merge commit '55a7b1ea5820b2fa8d754108b6a948d4bd60d98b' into glitch-soc/merge-4.5
2026-01-07 14:25:37 +01:00
Claire
c1fb6893c5
Merge commit from fork
2026-01-07 14:15:14 +01:00
Claire
71ae4cf2cf
Merge commit from fork
2026-01-07 14:14:42 +01:00
Claire
b134c6a8ef
Merge commit 'a846ed17ffb85087de658678b482495981f02770' into glitch-soc/merge-4.5
2026-01-06 18:12:51 +01:00
Claire
3013039720
Fix serialization of context pages ( #37376 )
2026-01-06 14:11:56 +01:00
Claire
ad4ba5aa00
Fix quotes with CWs but no text not having fallback link ( #37361 )
2026-01-06 14:11:56 +01:00
Claire
b868e598bc
Merge commit '3de59a93441367fbca0fd22818c8411adc73a967' into glitch-soc/merge-4.5
2025-12-28 10:51:43 +01:00
Claire
8233295e3b
Fix mentions of domain-blocked users being processed ( #37257 )
2025-12-19 11:02:32 +01:00
Claire
6c1e892dd7
Merge commit '86cff1abca6af7ffb1a6ca004ae308c0df6d45ba' into glitch-soc/merge-4.5
2025-12-08 16:37:11 +01:00
Claire
a6d31c0ccf
Fix streamed quoted polls not being hydrated correctly ( #37118 )
2025-12-05 11:15:16 +01:00
David Roetzel
1e2cf6c964
Fix creation of duplicate conversations ( #37108 )
2025-12-05 11:15:16 +01:00
Claire
585827c14f
Merge commit 'bb6093c3153f092736e2f25959e3dcdceeb7bce1' into glitch-soc/merge-4.5
2025-11-13 17:22:33 +01:00
Claire
59f0134578
Fix Update importing old previously-unknown activities and treating them as recent ones ( #36848 )
2025-11-13 15:24:58 +01:00
Claire
ea663cf7c7
Fix /api/v1/statuses/:id/context sometimes returing Mastodon-Async-Refresh without result_count ( #36779 )
2025-11-13 15:24:58 +01:00
Claire
7ea3c6a039
Merge commit 'e91c7645905972d9663a0d944b133ff24670bce2' into glitch-soc/merge-4.5
2025-11-05 10:02:33 +01:00
Claire
05964f571b
Prevent creation of Private Mentions quoting someone who is not mentioned ( #36689 )
2025-11-05 09:59:00 +01:00
Claire
5f5e6ca031
Merge commit 'af4c372ab22b636742833592235d18418604fcc1' into glitch-soc/merge-4.5
2025-10-31 16:04:05 +01:00
Claire
e4291e9b05
Fix SMTP configuration with mail 2.9.0 ( #36646 )
2025-10-31 14:09:36 +01:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
79169408b0
Fix tests on glitch-soc
2025-10-28 20:39:10 +01:00
Claire
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Claire
8fb524e07f
Add support for Update of converted object types ( #36322 )
2025-10-28 14:05:14 +00:00
Claire
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency ( #36559 )
2025-10-28 08:05:23 +00:00
