Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,291 Commits 74 Branches 58 Tags
d97910d6621d4b76bfb9985899a573a80c92d7d0
Commit Graph

8919 Commits

Author SHA1 Message Date
diondiondion
b5c477929b [Glitch] fix: Fix unauthenticated familiar followers request 
Port b64ad77e21 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 c77158c8b7 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 d47199dd4b 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 44d71d59ef 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 1cc853059f 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 54ad57ea95 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 0789ec93f8 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 975db93e3f 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 9860046b04 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 71a4a92dda 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 6ffa262546 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 d78535eab9 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 ba5320671c 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
Claire
e1cac17f4a Merge commit 'ba5320671c287b66284bc42544b3bccc506f22b9' into glitch-soc/merge-upstream 2025-05-26 20:47:12 +02:00
Claire
56b3726899 Fix glitch-soc flavor always loading english locales for upstream (#3076) 2025-05-26 18:45:55 +02:00
Echo
ba5320671c Move pinned posts to a carousel (#34754) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-05-26 13:35:28 +00:00
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
github-actions[bot]
d1d3ff087a New Crowdin Translations (automated) (#34795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-26 07:41:52 +00:00
Claire
558c73a21e Use @/ absolute paths instead of relative paths in CSS (#34806) 2025-05-26 07:27:44 +00:00
diondiondion
ac4255c9e5 [Glitch] fix: Allow quotes to be filtered 
Port 68a5724b3e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
Claire
d28a62f900 [Glitch] Change display of quote posts to strip fallback link and preview cards 
Port 02ac18da51 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
Claire
cac981662e [Glitch] Fix quotes not being displayed in reblogs 
Port e0ce4b9b6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
diondiondion
5061a32f1d [Glitch] Add visual indicator & link to nested quote posts 
Port 79ccba1758 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00
diondiondion
e3b424aa02 [Glitch] Add rendering of quote posts in web UI 
Port 97b9e8849d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 16:14:34 +02:00