Claire
73a625c284
Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream replaced a setting with 4 new ones, while glitch-soc had modified
the default value of that setting.
Removed the old setting and added the new settings, but with defaults
matching glitch-soc's previous behavior.
2025-10-06 19:24:16 +02:00
Claire
2d2c525097
Split timeline_preview setting into more granular settings ( #36338 )
2025-10-06 08:34:05 +00:00
nicole mikołajczyk
62f91eddf4
Do not display mute button in hashtag dropdown when unauthenticated ( #36353 )
...
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2025-10-05 14:24:54 +00:00
Claire
17e0c745c6
Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream
2025-10-01 19:13:18 +02:00
diondiondion
669738ef3b
Add quote/boost dropdown menu to boost button in media modal ( #36315 )
2025-10-01 12:18:19 +00:00
Claire
d51723bb57
Add UI support for displaying quotes of other people's posts ( #36301 )
2025-09-30 15:10:09 +00:00
diondiondion
473bd84c24
Update confirmation dialogs for follow button actions "unfollow", "unblock", and "withdraw request" ( #36289 )
2025-09-30 14:55:25 +00:00
Echo
c12b8f51c1
Emoji Component ( #36293 )
2025-09-30 13:06:02 +00:00
Brad Dunbar
ac50e5eebc
Convert mastodon/initial_state to TypeScript ( #36274 )
2025-09-30 11:14:58 +00:00
Claire
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Brad Dunbar
aae9a5528a
Remove shallow prop from Wrapper ( #36275 )
2025-09-29 09:10:27 +00:00
Claire
106b0a9d93
Merge commit 'a44a3f6d4047568921469ff9fbd212f553b1e7f4' into glitch-soc/merge-upstream
2025-09-27 21:46:57 +02:00
Claire
8fad4926c5
Merge commit '1571514e49ec02a57c050612b3bca856f54933fb' into glitch-soc/merge-upstream
2025-09-27 21:29:19 +02:00
diondiondion
cb5bbbfb05
Update "Follow" button labels ( #36264 )
2025-09-26 10:00:50 +00:00
Echo
e07b9dfdc1
Adds new HTMLBlock component ( #36262 )
2025-09-26 09:50:59 +00:00
Brad Dunbar
238d74fe81
Refactor getFocusedItemIndex to avoid conditionals that closest already handles ( #36267 )
2025-09-26 08:53:08 +00:00
Claire
4053209a05
Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream
2025-09-25 18:44:23 +02:00
diondiondion
11bd515648
Allow accessing ref of ScrollContainer's child ( #36265 )
2025-09-25 16:14:49 +00:00
diondiondion
d801cf8e59
Replace react-router-scroll-4 with inlined implementation ( #36253 )
2025-09-25 12:26:50 +00:00
renovate[bot]
cc54b33720
chore(deps): update dependency typescript to ~5.9.0 ( #36212 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
2025-09-25 07:52:37 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
diondiondion
3a81ee8f5b
Implement new design for "Refetch all" ( #36172 )
2025-09-24 09:54:07 +00:00
Echo
29d9f81e42
Fix missed event handler ( #36248 )
2025-09-24 09:37:11 +00:00
diondiondion
059bf1e980
Highlight newly added replies in thread view ( #36237 )
2025-09-24 09:27:33 +00:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
a548c5c29b
Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream
2025-09-23 18:41:09 +02:00
Echo
6bd90940b6
Refactor emoji GIF animation ( #36165 )
2025-09-23 08:53:14 +00:00
diondiondion
e473583da0
Add quote-related info to a post's aria-label ( #36169 )
2025-09-22 13:50:29 +00:00
Claire
210786efd8
Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream
2025-09-17 18:17:18 +02:00
Echo
dfef7d9407
Refactor: Replace all display name usage for new component ( #36137 )
2025-09-17 09:00:57 +00:00
Claire
cc52833296
Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream
2025-09-15 18:39:09 +02:00
diondiondion
38fa0102c1
Fix logged-out quote menu UX, simplify Interaction dialog copy ( #36124 )
2025-09-15 15:38:11 +00:00
Claire
9f97df84da
Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream
2025-09-11 21:20:15 +02:00
diondiondion
84d1ba980b
Allow removing deleted quotes from composer ( #36080 )
2025-09-11 14:44:20 +00:00
Claire
06f45a2046
Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually adjacent to glitch-soc-only ones.
Updated them as upstream did.
2025-09-10 18:11:12 +02:00
diondiondion
377e870348
Improve accessibility of visibility modal dropdowns ( #36068 )
2025-09-09 17:44:43 +00:00
diondiondion
cf20c5db9c
Show hint explaining post visibility when quoting a "quiet public" post ( #36065 )
2025-09-09 12:43:23 +00:00
Claire
2347354bba
Fix unresponsive areas around GIFV modals in some cases ( #36059 )
2025-09-08 14:11:10 +00:00
diondiondion
0153b49ef7
Visibility modal: Match dropdown width to button ( #36054 )
2025-09-08 12:43:38 +00:00
Echo
b99c94537b
Revert change to EmojiHTML ( #36051 )
2025-09-08 12:08:07 +00:00
diondiondion
a5fbe2f5c1
Fix missing icons and subtitle in mobile boost/quote menu ( #36038 )
2025-09-08 08:50:46 +00:00
Claire
7ddb8814e1
Change description of “Quiet public” ( #36032 )
2025-09-05 18:35:34 +00:00
Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Claire
de09e33c92
Change “Boost with original visibility” to “Share again with your followers” ( #36035 )
2025-09-05 08:59:16 +00:00
Claire
9a2be25199
Fix missing beforeUnload confirmation when a quote post is being authored ( #36034 )
2025-09-05 08:51:49 +00:00
Claire
0d93801bde
Fix missing beforeUnload confirmation when a poll is being authored ( #36030 )
2025-09-05 08:07:59 +00:00
Echo
42be0ca0eb
Adds DisplayName component ( #35985 )
2025-09-04 10:09:27 +00:00
Claire
d5b959a2ca
Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Claire
75fca715e9
Change public self-quotes of private posts to be disallowed ( #35975 )
2025-09-02 15:48:37 +00:00
Claire
5d9a9c76fb
Change icon variant for quotes ( #35991 )
2025-09-02 13:52:09 +00:00
