Claire
e08c8b6933
Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/settings_helper.rb`:
Upstream added a new helper.
Conflict caused by the fact there is a glitch-soc specific helper.
Added upstream's new helper in addition to glitch-soc's.
2026-06-09 21:30:54 +02:00
Matt Jankowski
e9697922c1
Handle offset relative to TZ in options list ( #39334 )
2026-06-09 12:58:45 +00:00
Claire
c2e6cbb12b
Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream
2026-06-07 14:29:57 +02:00
batumi14
472b28e5dd
Add Lazuri, Mingrelian and Ottoman Turkish to languages helper ( #38648 )
2026-06-05 13:34:13 +00:00
Claire
a1ab96baed
Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream
2026-06-03 22:30:16 +02:00
David Roetzel
8b18195075
Add missing FeaturedCollection vocabulary to contexts ( #39251 )
2026-06-03 13:56:38 +00:00
Claire
659a077616
Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream
2026-06-03 12:19:05 +02:00
Claire
c2daca655f
Merge commit from fork
2026-06-03 11:57:50 +02:00
Claire
487c814eb9
Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Glitch-soc allows a wider range of HTML than upstream.
Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
added it there too.
2026-05-22 19:43:42 +02:00
diondiondion
ae8b794c66
Accessibility: Convey selected state of filters on Follows and followers page ( #39134 )
2026-05-22 09:23:37 +00:00
Claire
ca427bc176
Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream
2026-05-20 15:43:33 +02:00
Claire
0786c1e57a
Merge commit from fork
2026-05-20 14:38:24 +02:00
Claire
0c80bf0e82
Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
Adapted upstream's change.
- `yarn.lock`:
Upstream updated a dependency next to one glitch-soc added.
Updated the dependency as upstream did.
2026-05-19 20:40:57 +02:00
Tan, Kian-ting
b3992e62ed
fix nan-tw not listed in SUPPORTED_LOCALES ( #37721 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2026-05-19 07:16:50 +00:00
Claire
99f0a03dec
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream
2026-05-07 18:26:17 +02:00
Claire
fcd56d6732
Fix type of interactingObject, interactionTarget and add missing QuoteAuthorization ( #38940 )
2026-05-07 14:47:19 +00:00
Claire
6935fce458
Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream
2026-05-04 21:08:25 +02:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions ( #38741 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2026-05-04 13:56:04 +00:00
Claire
0b3c848958
Merge commit 'a706fce6781104b3aa1315be14f1fb8ccd4fcb1b' into glitch-soc/merge-upstream
2026-04-21 19:20:05 +02:00
Matt Jankowski
c589530e22
Add constants to track media player height/width ( #38755 )
2026-04-21 11:10:45 +00:00
Shlee
bdad4f78f3
Fallback to default theme when admin-selected theme does not exist ( #38703 )
2026-04-17 16:57:38 +00:00
Claire
e0a34e6d89
Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream
2026-04-17 18:06:10 +02:00
Matt Jankowski
1d3ca80bf7
Use model constants more consistently for view expiration collections ( #38589 )
2026-04-17 13:57:18 +00:00
Matt Jankowski
3411d06f9e
Pull user settings defaults from configuration ( #38592 )
2026-04-17 08:31:37 +00:00
Claire
ff80786d2e
Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream
2026-04-15 13:36:46 +02:00
Claire
e9af9c649f
Fix definition for quote in JSON-LD context ( #38686 )
2026-04-15 10:17:47 +00:00
Claire
cb62beca08
Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream
2026-04-02 18:20:01 +02:00
Eugen Rochko
8a5d6dab5f
Fix relative sign-up path in e-mail subscription notification ( #38527 )
2026-04-02 11:14:42 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
Claire
e81a4e258c
Add support for FEP-2c59 ( #38239 )
2026-03-26 13:33:16 +00:00
Claire
60236bffe6
Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream
2026-03-24 12:13:39 +01:00
Claire
ca08c040b0
Federate new profile settings ( #38314 )
2026-03-24 09:20:17 +00:00
Claire
04bf07a9cf
Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream
2026-03-17 18:01:07 +01:00
Matt Jankowski
f07e84f9de
Rescue JSON::ParserError where already converted ( #38244 )
2026-03-17 08:57:10 +00:00
Claire
73f77c49d8
Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Matt Jankowski
3832030711
Convert Oj.load -> JSON.parse in most places ( #38236 )
2026-03-16 16:38:19 +00:00
Claire
4359098740
Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream
2026-03-16 12:17:49 +01:00
Matt Jankowski
8d5d66ecfc
Remove unused react component helper method ( #38207 )
2026-03-16 09:02:21 +00:00
Claire
3afb58ad18
Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream
2026-03-14 11:41:24 +01:00
diondiondion
89b7a3d7fb
A11y improvements on login & settings pages ( #38188 )
2026-03-13 17:14:04 +00:00
Claire
d2f5feb25f
Fix linting issue
2026-03-02 18:59:32 +01:00
Claire
1b92ac0729
Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream
2026-03-02 18:11:45 +01:00
Matt Jankowski
e7cec161fd
Reduce haml-lint LineLength configuration to 240 ( #37287 )
2026-03-02 14:43:57 +00:00
Claire
e3cb4dea42
Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream
2026-02-25 19:11:22 +01:00
David Roetzel
f9326efef6
Add moderation consequences for collections ( #37974 )
2026-02-25 14:32:07 +00:00
Claire
5f72148834
Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream
2026-02-13 18:26:08 +01:00
Matt Jankowski
56ecdde152
Add ContentPoliciesHelper#policy_list to wrap string building in views ( #37856 )
2026-02-13 15:54:41 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Claire
9129f98776
Process actor public keys when they are in a separate document without the ActivityStreams context ( #37826 )
2026-02-11 15:47:24 +00:00
Claire
2f8ecb894e
Fix generation of static error pages in glitch-soc
2026-02-11 14:12:46 +01:00
