Commit Graph

25447 Commits

Author SHA1 Message Date
Claire
d2d5767f32 Merge pull request #3102 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 69f298731e
2025-06-17 10:49:13 +02:00
Eugen Rochko
56e092927d [Glitch] Change order of items in navigation panel in web UI
Port 7c4393e719 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 22:04:18 +02:00
diondiondion
3731738aa0 [Glitch] fix: Fix glitchy iOS media attachment drag interactions
Port 69f298731e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 22:04:18 +02:00
Echo
cbdd4b68c7 [Glitch] Change color of pinned carousel to avoid confusion with PMs
Port af6ee7f230 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 22:04:11 +02:00
Claire
d17e4d11d0 Fix dev mode for glitch-soc 2025-06-16 21:43:30 +02:00
Claire
0bb83dfe7d Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream 2025-06-16 21:07:55 +02:00
Claire
cc618f0738 Merge pull request #3101 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to c644413f8a
2025-06-16 21:03:19 +02:00
diondiondion
0237f79665 [Glitch] fix: Fix zoomed images blurry in Safari
Port ad32834ccd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 20:12:28 +02:00
diondiondion
bde8aa2781 [Glitch] fix: Fix unresponsive status banner button
Port 4d29215ad3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 20:12:00 +02:00
diondiondion
19aa68897b [Glitch] fix: Remove redundant focus stop within status
Port ed4788a342 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 20:11:31 +02:00
Claire
2c751a6a19 Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream 2025-06-16 20:08:52 +02:00
github-actions[bot]
77862311cf New Crowdin Translations (automated) (#3041)
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-06-16 20:07:18 +02:00
diondiondion
69f298731e fix: Fix glitchy iOS media attachment drag interactions (#35057) 2025-06-16 15:37:04 +00:00
Echo
af6ee7f230 Change color of pinned carousel to avoid confusion with PMs (#35056) 2025-06-16 15:32:59 +00:00
Eugen Rochko
7c4393e719 Change order of items in navigation panel in web UI (#35029) 2025-06-16 15:06:33 +00:00
Claire
013c527406 Fix vite helpers crash in development mode (#35035)
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
2025-06-16 14:25:12 +00:00
Claire
c644413f8a Fix database error instead of form validation on ToS effective date conflict (#35053) 2025-06-16 13:44:48 +00:00
Matt Jankowski
ca3cc36549 Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests (#35040) 2025-06-16 13:12:23 +00:00
David Roetzel
b2506478ba Add FASP follow recommendation support (#34964) 2025-06-16 10:43:27 +00:00
diondiondion
ad32834ccd fix: Fix zoomed images blurry in Safari (#35052) 2025-06-16 10:37:41 +00:00
diondiondion
4d29215ad3 fix: Fix unresponsive status banner button (#35051) 2025-06-16 07:35:32 +00:00
renovate[bot]
0544898b8b fix(deps): update dependency babel-plugin-formatjs to v10.5.39 (#35049)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-06-16 06:28:26 +00:00
renovate[bot]
aef1b4f5b7 chore(deps): update dependency webauthn to v3.4.1 (#35048)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-06-16 06:28:22 +00:00
github-actions[bot]
070455cad0 New Crowdin Translations (automated) (#35044)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-06-16 06:26:25 +00:00
Matt Jankowski
6f2aba989f Move "limited federation mode" config to x.mastodon area (#35041) 2025-06-16 06:13:03 +00:00
Essem
fe337904b2 Fix missing notification badge (#3100) 2025-06-15 21:22:06 +02:00
Claire
a27202fbbc Merge pull request #3099 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 71d4ce1c22
2025-06-14 22:06:54 +02:00
diondiondion
ed4788a342 fix: Remove redundant focus stop within status (#35037) 2025-06-13 16:47:02 +00:00
diondiondion
500fb00c2f [Glitch] fix: Ensure digits in media player time readout have a consistent width
Port 71d4ce1c22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-13 18:15:58 +02:00
diondiondion
e20ef39da4 [Glitch] fix: Fix glitchy video player controls in Safari
Port e28f86cbe5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-13 18:15:37 +02:00
diondiondion
7ccf7fc456 [Glitch] fix: Fix unreadable text in high-contrast-mode
Port 672d411c2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-13 18:15:15 +02:00
diondiondion
9e5e3a50a0 [Glitch] fix: Hide limited user info in hover card
Port f92ff6d699 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-13 18:14:12 +02:00
Claire
7da6b07c75 Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream 2025-06-13 18:07:59 +02:00
diondiondion
71d4ce1c22 fix: Ensure digits in media player time readout have a consistent width (#35038) 2025-06-13 15:30:40 +00:00
Claire
e8868af079 Fix crash in StatusEdit serializer when quote posts are involved (#35036) 2025-06-13 14:59:52 +00:00
diondiondion
e28f86cbe5 fix: Fix glitchy video player controls in Safari (#35034) 2025-06-13 14:28:49 +00:00
David Roetzel
83d5016ca3 Re-instate rescuing signature errors (#35033) 2025-06-13 13:36:33 +00:00
diondiondion
672d411c2c fix: Fix unreadable text in high-contrast-mode (#35032) 2025-06-13 12:58:30 +00:00
github-actions[bot]
5ce055759f New Crowdin Translations (automated) (#35030)
Co-authored-by: GitHub Actions <noreply@github.com>
2025-06-13 08:20:19 +00:00
Claire
39a1a4a8d7 Merge pull request #3098 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 825312d4b0
2025-06-13 10:11:13 +02:00
Matt Jankowski
ab7f50ce4e Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025) 2025-06-13 07:58:22 +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
7e85247645 Merge pull request #3097 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 2254f47702
2025-06-12 20:02:12 +02:00
diondiondion
f92ff6d699 fix: Hide limited user info in hover card (#35024) 2025-06-12 16:13:17 +00:00
diondiondion
3fef107791 [Glitch] fix: Avatars too large on notifications page
Port 2254f47702 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-12 17:54:52 +02:00
diondiondion
d5ba3aa6bd [Glitch] fix: Fix error caused by attempt to fetch non-existent quote
Port 9f94ddcd40 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-12 17:54:21 +02:00
Eugen Rochko
442401c47e [Glitch] Change viewport behaviour to cover
Port ccf7760205 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-12 17:53:52 +02:00
Eugen Rochko
b977600e07 [Glitch] Change "Explore" to "Trending" and remove explanation banners
Port d1fb957361 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-12 17:50:59 +02:00
Eugen Rochko
00c34c6179 [Glitch] Remove prominent logout button from profile card in sidebar in web UI
Port 6fcbd7c17a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-12 17:49:11 +02:00
diondiondion
c4feceab06 [Glitch] fix: Fetch missing nested quotes
Port d4d77ace97 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2025-06-12 17:46:01 +02:00