Claire
4c0104084d
Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream
2025-10-17 18:36:27 +02:00
Emelia Smith
210b389643
Implement quote posts in Moderator UI ( #35964 )
2025-10-16 13:40:24 +00:00
Claire
ee88f8550c
Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream
2025-10-10 19:01:35 +02:00
Emelia Smith
81350c7cfb
Add support for displaying link previews for Admin UI ( #35958 )
2025-10-10 08:43:48 +00:00
Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
diondiondion
4a40f81067
Link to local accounts from settings ( #36340 )
2025-10-06 14:10:26 +00:00
Claire
a548c5c29b
Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream
2025-09-23 18:41:09 +02:00
Itoh Shimon
99d5af9914
Add Traditional Mongolian to posting languages ( #36196 )
2025-09-22 14:05:07 +00:00
Claire
26193a119b
Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper close to a glitch-soc one.
Added upstream's helper.
2025-09-16 18:30:30 +02:00
Eugen Rochko
d9b70bbde1
Fix login page linking to other pages within OAuth authorization flow ( #36115 )
2025-09-16 14:25:21 +00:00
Claire
5da295fa4d
Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream
2025-09-13 11:12:22 +02:00
Eugen Rochko
30b31a89e6
Add schema.org markup to SEO-enabled posts ( #36075 )
2025-09-12 09:12:07 +00:00
Claire
705ea99136
Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream added an optional keyword argument where glitch-soc already had one for content-type.
Added upstream's new option while keeping glitch-soc's.
2025-09-03 14:39:57 +02:00
Claire
624c024766
Prepend “RE: <url>” fallback link to Mastodon-authored quote posts ( #35971 )
2025-09-03 09:35:44 +00:00
Claire
884d7996b1
Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream
2025-08-27 18:13:03 +02:00
Matt Jankowski
5cb7dfafcc
Move lengthy ruby logic from mailer view to helper ( #35911 )
2025-08-27 13:15:33 +00:00
Claire
5cac4dfb5c
Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream
2025-08-22 22:52:55 +02:00
Emelia Smith
4f494781c1
Refactor to reuse the one status partial across moderation tools ( #35644 )
2025-08-21 14:51:11 +00:00
Claire
e68de292b4
Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream
2025-08-07 18:16:54 +02:00
Matt Jankowski
a485f97d21
Replace EmailHelper module with normalizes via model concern ( #35702 )
2025-08-07 13:47:47 +00:00
Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps ( #35626 )
2025-08-01 14:55:25 +00:00
Matt Jankowski
483da67204
Remove unused obscured_counter helper method ( #35627 )
2025-08-01 14:28:45 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Eugen Rochko
20bbd20ef1
Add ability to block words in usernames ( #35407 )
2025-07-29 10:19:15 +00:00
Matt Jankowski
c587c44975
Fix Lint/NonLocalExitFromIterator cop in JSON-LD helper ( #34948 )
2025-07-28 15:35:37 +00:00
Matt Jankowski
e183d7dd9a
Fix Style/GuardClause in app/helpers ( #35526 )
2025-07-28 08:40:20 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Matt Jankowski
960f693219
Use field partial in admin account show view ( #35503 )
2025-07-25 07:21:08 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Claire
5bbc3c5ebb
Fix quoteAuthorization type in JSON-LD context ( #35380 )
2025-07-15 09:32:02 +00:00
Claire
1716f8da71
Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream added a `features` attribute where glitch-soc had extra ones.
Added `features` like upstream did.
2025-07-11 18:53:47 +02:00
Claire
3b52dca405
Fix quote attributes missing from Mastodon's context ( #35354 )
2025-07-11 16:35:06 +00:00
Claire
a315934314
Fix styling of external log-in button ( #35320 )
2025-07-10 06:56:40 +00:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
Matt Jankowski
6f2aba989f
Move "limited federation mode" config to x.mastodon area ( #35041 )
2025-06-16 06:13:03 +00:00
Claire
80af1ea434
Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because of different theming system.
Adapted upstream's changes.
- `vite.config.mts`:
Conflict because of different theming system.
Adapted upstream's changes.
2025-06-12 20:32:25 +02:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
Echo
825312d4b0
Fix theme name requirement regression with efficient lookup by name ( #35007 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-06-12 14:09:45 +00:00
Eugen Rochko
24d943fee0
Change media attachments in moderated posts to not be accessible ( #34872 )
2025-06-12 08:53:02 +00:00
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Claire
7a7e0ba4cd
Add basic support for remote attachments with multiple media types ( #34996 )
2025-06-10 13:26:29 +00:00
Claire
23ce6d326c
Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream removed OTel instrumentation around some code modified in glitch-soc
because of the Markdown rendering feature.
Removed the OTel instrumentation as upstream did.
2025-06-03 18:34:37 +02:00
Claire
129e72b914
Revert "Add telemetry for status / bio formatting ( #32677 )" ( #34906 )
2025-06-03 15:06:32 +00: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
Echo
c4f47adb49
Convert from Webpack to Vite ( #34450 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-05-16 13:26:12 +00:00
Claire
d14d7a5379
Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream
2025-05-05 20:31:48 +02:00
Claire
cbaba54e9d
Add support for importing embedded self-quotes ( #34584 )
2025-05-05 08:01:16 +00:00
Claire
ff07676aee
Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream
2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
