Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 00:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,246 Commits 74 Branches 58 Tags
0f591649c46801c28b953b53aed351f950f3798a
Commit Graph

8901 Commits

Author SHA1 Message Date
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
Echo
7efac8c025 [Glitch] Revert React Spring to 9.7.5 and updates Renovate 
Port 84d03e4e16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:26:37 +02:00
nicole mikołajczyk
93350d6dd9 [Glitch] Fix “Open original page” and “Add or Remove from lists” being included in account dropdown even when irrelevant 
Port 6b066eac2c to glitch-soc

Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:26:37 +02:00
diondiondion
964e8f7cf8 [Glitch] fix: Fix various UI text wrapping and overflow issues 
Port 5dda094daa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:26:37 +02:00
diondiondion
4c67a70159 [Glitch] Add "Followers you know" to hovercard 
Port 12c8a6498c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:26:37 +02:00
Claire
6ba575e0d3 [Glitch] Use more generic locale as fallback for rules 
Port 6ab96ba647 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:20:14 +02:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
renovate[bot]
dafe4f6642 [Glitch] chore(deps): update dependency stylelint-config-standard-scss to v15 
Port 8ab2c4a9fc to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:02:03 +02:00
Claire
7dfa5d6d1b [Glitch] Add ability to translate server rules 
Port 8c51a8ba94 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:02:03 +02:00
Nick Schonning
c7dfb84b12 [Glitch] Enable Stylelint color-hex-length 
Port d8ea8bc3bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 15:02:03 +02:00
Claire
8bb924105c [Glitch] Fix incorrect progress value being passed to react-spring in video player 
Port ef87cd6910 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 14:54:57 +02:00
Claire
87c139d393 [Glitch] Add ability to reorder server rules from admin interface 
Port CSS changes from d7cb6068b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 14:54:30 +02:00
diondiondion
85691ea546 [Glitch] fix: Prevent long link names in admin sidebar from being truncated 
Port 4372d17114 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 14:53:39 +02:00
renovate[bot]
30cde6c34d [Glitch] fix(deps): update dependency @react-spring/web to v10 
Port feb4e0a007 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 14:53:19 +02:00
diondiondion
c046ac5f07 [Glitch] fix: Show Follow account modal before allowing adding to list 
Port 24551375cf to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-25 14:52:32 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
diondiondion
a13756148d fix: Show hint for quotes hidden by filter (#34790) 2025-05-23 15:26:06 +00:00