tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,310 Commits 5 Branches 0 Tags
Commit Graph

8930 Commits

Author SHA1 Message Date
diondiondion
4dbbe520fb [Glitch] fix: Fix broken audio player layout in Safari 
Port 1dafd8c9dd66a6a97573cb4b2008a39b7c986d47 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:08:47 +02:00
diondiondion
6bb29dec13 [Glitch] fix: Fix Safari volume bug 
Port 6637ecb460460dfc0a6e55906dd4507839c9b1c7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:08:12 +02:00
Echo
a6a35ad1ce [Glitch] Ensure carousel slides don't overflow 
Port e9f197740d831b0685ed53bcf3e4dc05b86a74b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-05 18:07:37 +02:00
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Claire
520974e052
Add ability to filter quote posts in home timeline (#34946) 2025-06-05 15:36:51 +00:00
Echo
1fdcaaebbb
Add a way to easily unpin profiles from the featured account area (#34931) 2025-06-05 10:23:01 +00:00
Claire
375add0c83
Fix account note textarea being interactable before the relationship gets fetched (#34932) 2025-06-05 08:49:26 +00:00
github-actions[bot]
250c3b0c1f
New Crowdin Translations (automated) (#34939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-05 07:05:25 +00:00
diondiondion
1dafd8c9dd
fix: Fix broken audio player layout in Safari, #34930 (#34933) 2025-06-04 15:34:13 +00:00
diondiondion
6637ecb460
fix: Fix Safari volume bug, #34797 (#34929) 2025-06-04 14:35:29 +00:00
Echo
e9f197740d
Ensure carousel slides don't overflow (#34927) 2025-06-04 14:29:34 +00:00
diondiondion
b5c477929b [Glitch] fix: Fix unauthenticated familiar followers request 
Port b64ad77e21eaedd3bfb21cd5b33102343ad2ef25 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-04 11:02:12 +02:00
Claire
5d9e5967aa Merge commit 'f7c19226cff625895478b80302201c98f36163c8' into glitch-soc/merge-upstream 2025-06-04 11:01:40 +02:00
diondiondion
b64ad77e21
fix: Fix unauthenticated familiar followers request, #34911 (#34914) 2025-06-04 08:25:10 +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
github-actions[bot]
efe8def0c6
New Crowdin Translations (automated) (#34897) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-03 07:57:07 +00:00
Eugen Rochko
1144515310 [Glitch] Fix nested buttons in search popout in web UI 
Port c77158c8b7eac88ade85392903e294765097fee9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-02 20:16:15 +02:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Eugen Rochko
c77158c8b7
Fix nested buttons in search popout in web UI (#34871) 2025-06-02 12:21:31 +00:00
Eugen Rochko
8d8b0b2ec0 [Glitch] Fix not being able to scroll dropdown on touch devices in web UI 
Port d47199dd4b084a113020cfa724c49e303892321f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-02 12:17:04 +02:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
github-actions[bot]
eb42425427
New Crowdin Translations (automated) (#34874) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-02 08:24:52 +00:00
Eugen Rochko
d47199dd4b
Fix not being able to scroll dropdown on touch devices in web UI (#34873) 2025-06-02 08:07:42 +00:00
Eugen Rochko
2cf44bc914 [Glitch] Add icon to header of pinned posts carousel in web UI 
Port 44d71d59efd79ee723a1dec72ec77833560c45cf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-31 15:31:44 +02:00
diondiondion
eef71fcc07 [Glitch] refactor(Pinned posts carousel): Don't animate initial resize 
Port 1cc853059f68f12cddbd09ad8017c3d196d384f4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-31 15:31:13 +02:00
Claire
c2989e231d Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream 2025-05-31 15:30:19 +02:00
Eugen Rochko
44d71d59ef
Add icon to header of pinned posts carousel in web UI (#34869) 2025-05-30 22:24:34 +00:00
diondiondion
1cc853059f
refactor(Pinned posts carousel): Don't animate initial resize (#34868) 2025-05-30 18:06:41 +00:00
diondiondion
f97bcb00b4 [Glitch] fix: Fix autoplay not working properly in AudioModal, #34841 
Port 54ad57ea9527a58ac2b95159ed178ed7c737a89c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:44:53 +02:00
Nicholas La Roux
0f591649c4 [Glitch] Make account header profile pic exactly 2x post profile pic 
Port 0789ec93f84ba1bc5cd220cc31622a0779ebe9ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:44:27 +02:00
diondiondion
c80b14e251 [Glitch] feat: Add relationship info to hover card 
Port 975db93e3f57134cc85b4cc1458141fa094b61da to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:58 +02:00
Echo
d7ba8451cf [Glitch] Fix pinned carousel scroll on mobile 
Port 9860046b04a03a40942f5f4bf2ed3f54ea377ccb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:38 +02:00
Claire
4693aab179 [Glitch] Fix featured posts and familiar followers showing up on hidden accounts 
Port 71a4a92ddad876c42430baed3a0f3ae1983e6f26 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-30 17:43:13 +02:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
diondiondion
54ad57ea95
fix: Fix autoplay not working properly in AudioModal, #34841 (#34865) 2025-05-30 15:26:08 +00:00
Nicholas La Roux
0789ec93f8
Make account header profile pic exactly 2x post profile pic (#34807) 2025-05-30 12:33:30 +00:00
diondiondion
975db93e3f
feat: Add relationship info to hover card (#34792) 2025-05-30 12:32:19 +00:00
Echo
9860046b04
Fix pinned carousel scroll on mobile (#34858) 2025-05-30 09:08:09 +00:00
Claire
71a4a92dda
Fix featured posts and familiar followers showing up on hidden accounts (#34855) 2025-05-30 08:33:52 +00:00
github-actions[bot]
4130d9659c
New Crowdin Translations (automated) (#34847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-30 07:34:17 +00:00
Echo
7fa6d6193c [Glitch] Update ESLint to not try to resolve virtual modules 
Port 6ffa26254607706c222e579dc2527db96db994d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-28 18:43:22 +02:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
Echo
6ffa262546
Update ESLint to not try to resolve virtual modules (#34837) 2025-05-28 10:04:52 +00:00
github-actions[bot]
43ccb04548
New Crowdin Translations (automated) (#34834) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-28 08:38:51 +00:00
Echo
ebab5e42c0 [Glitch] Add language picker to server rules section 
Port d78535eab9cefc285c0d7ef88adb125ab1ceb6bd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-27 20:51:37 +02:00
Claire
086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Echo
d78535eab9
Add language picker to server rules section (#34820) 2025-05-27 13:57:34 +00:00
github-actions[bot]
32b5da558e
New Crowdin Translations (automated) (#34817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-27 09:28:32 +00:00
Claire
8bb75bd4ab Fix issue with status width in glitch-soc 2025-05-26 21:27:11 +02:00
Echo
5bd7b2c6f3 [Glitch] Move pinned posts to a carousel 
Port ba5320671c287b66284bc42544b3bccc506f22b9 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-26 21:06:15 +02:00