Claire
cb62beca08
Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream
2026-04-02 18:20:01 +02:00
Claire
954cc92a6d
Fix being unable to disable sound for quote update notification ( #38537 )
2026-04-02 13:47:22 +00:00
Claire
469076c357
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream
2026-03-20 18:03:14 +01:00
Echo
6507a61d30
Profile redesign: Profile tab settings ( #38309 )
2026-03-20 13:38: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
Echo
21c27eb3af
Profile editing: Uploading avatar and header images ( #38189 )
2026-03-16 11:39:52 +00:00
Claire
5f72148834
Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream
2026-02-13 18:26:08 +01:00
Echo
3d0a6ba831
Emoji: Cache data by path instead of just Etag ( #37858 )
2026-02-13 15:23:22 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
Claire
ab9aa25cd3
Fix delete & redraft of pending posts ( #37839 )
2026-02-13 10:32:16 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Echo
ca9966ce2f
Make pinning and unpinning directly modify state ( #37831 )
2026-02-11 16:58:00 +00:00
Claire
c8db60f8d2
Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream
2026-02-09 21:45:21 +01:00
Echo
b4fb25643a
Fix: Changes to pins update immediately ( #37765 )
2026-02-09 13:14:24 +00:00
Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Echo
2e30044a37
Profile redesign: Pinned posts ( #37761 )
...
Co-authored-by: diondiondion <mail@diondiondion.com>
2026-02-06 14:53:34 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
Echo
346ca87ee8
Profile redesign: Follow button and menu reorg ( #37707 )
2026-02-03 11:33:20 +00:00
Claire
0e154b859f
Merge commit '6a5578a0db1aed100b6a3ac82b477923d221c350' into glitch-soc/merge-upstream
2026-01-30 12:00:44 +01:00
Echo
0688e64a0b
Fix instance api account merging ( #37666 )
2026-01-30 09:30:22 +00:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Echo
ec76288dff
Profile redesign: Timeline filters ( #37626 )
2026-01-28 10:17:32 +00:00
Claire
b6b6e142ba
Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream modified `theme_color_tags` to work on color scheme rather than theme.
Updated it as well.
- `app/views/layouts/embedded.html.haml`:
Upstream changed the embed theme from `mastodon-light` to `system`.
Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
Accomodate `theme_color_tags` changes.
2026-01-16 22:28:08 +01:00
Heath Dutton🕴️
93f5ed0fce
Fix directory showing load more button when no more profiles exist ( #37465 )
2026-01-15 17:02:17 +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
Echo
3d55dcdf7f
Emoji: Refresh custom emoji on new ( #37271 )
2025-12-17 14:58:22 +00:00
Claire
d6a40c2891
Fix hashtag autocomplete replacing suggestion's first characters with input ( #37281 )
2025-12-17 14:28:53 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Echo
a9c84529b2
Wrapstodon: Load report data only on display ( #37269 )
2025-12-16 13:00:40 +00:00
Claire
6503287c2d
Merge commit '4af8e83c8a236265c46a1b984fa5dbd3a7c73dfe' into glitch-soc/merge-upstream
2025-12-12 17:45:26 +01:00
diondiondion
8748f0812d
Convert Settings class to TS ( #37218 )
2025-12-12 10:20:32 +00:00
Echo
10f232ca08
Wrapstodon: Allow dismissing banner ( #37202 )
2025-12-12 09:40:45 +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
Echo
76184c998c
Fix issue where Wrapstodon was pushed to the bottom of the feed ( #37190 )
2025-12-10 15:55:12 +00:00
Claire
315f5e5a31
Merge commit '9d81561bb2440c8fb9a75bd05277120aff346b1e' into glitch-soc/merge-upstream
2025-12-09 18:06:56 +01:00
Echo
9702cbb41c
Fix emoji on Wrapstodon ( #37177 )
2025-12-09 10:36:08 +00:00
Claire
34aa825e96
Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream
2025-12-04 20:16:21 +01:00
Echo
e5e3a64a9b
Display Wrapstodon inline widget ( #37106 )
2025-12-03 13:58:38 +00:00
Claire
edfbcfb3f5
Fix error handling when re-fetching already-known statuses ( #37077 )
2025-12-01 10:52:06 +00:00
Claire
44e6abe48b
Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream
2025-11-30 16:40:18 +01:00
diondiondion
07ecf648dd
Remove unused bundle-related Redux actions ( #37030 )
2025-11-27 10:50:48 +00:00
Claire
e0d7230f97
Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream
2025-11-14 18:19:00 +01:00
Claire
f25e066112
Fix bogus quote approval policy not always being replaced correctly ( #36885 )
2025-11-14 12:39:04 +00:00
Claire
6d8c43ab85
Fix hashtag completion not being inserted correctly ( #36884 )
2025-11-14 12:23:40 +00:00
Claire
bebc79d160
Merge commit '98c8c1ebd278f59e97c7d17628e7710cd4c933d4' into glitch-soc/merge-upstream
2025-11-13 18:12:49 +01:00
Claire
98c8c1ebd2
Fix error when sending new posts ( #36869 )
2025-11-13 15:42:14 +00:00
Claire
9dbebbb2ee
Fix posts coming from public/hashtag streaming being marked as unquotable ( #36860 )
2025-11-13 12:54:28 +00:00
Claire
a7ba4ba446
Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream
2025-11-04 20:38:24 +01:00
Claire
26e7fe9771
Change paste-link-to-quote loading state from generic loading bar to compose placeholder ( #36695 )
2025-11-04 19:20:39 +00:00
Claire
1b795c12e9
Change quote action to error instead of insert link in Private Mentions ( #36721 )
2025-11-04 17:58:50 +00:00
