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

9030 Commits

Author SHA1 Message Date
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
Echo
84d03e4e16 Revert React Spring to 9.7.5 and updates Renovate (#34788) 2025-05-23 12:34:41 +00:00
diondiondion
68a5724b3e fix: Allow quotes to be filtered (#34786) 2025-05-23 11:42:55 +00:00
github-actions[bot]
11c8177498 New Crowdin Translations (automated) (#34781) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-23 07:24:21 +00:00
nicole mikołajczyk
6b066eac2c Fix “Open original page” and “Add or Remove from lists” being included in account dropdown even when irrelevant (#34767) 
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
 2025-05-23 07:11:32 +00:00
diondiondion
5dda094daa fix: Fix various UI text wrapping and overflow issues (#34774) 2025-05-23 07:07:05 +00:00
Claire
02ac18da51 Change display of quote posts to strip fallback link and preview cards (#34772) 2025-05-23 06:53:04 +00:00
Claire
e0ce4b9b6b Fix quotes not being displayed in reblogs (#34773) 2025-05-22 15:23:45 +00:00
diondiondion
12c8a6498c Add "Followers you know" to hovercard (#34769) 2025-05-22 12:46:14 +00:00
diondiondion
79ccba1758 Add visual indicator & link to nested quote posts (#34766) 2025-05-22 10:39:45 +00:00
github-actions[bot]
cddb69ed52 New Crowdin Translations (automated) (#34762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-22 10:11:03 +00:00
Claire
6ab96ba647 Use more generic locale as fallback for rules (#34756) 2025-05-21 16:22:54 +00:00
diondiondion
97b9e8849d Add rendering of quote posts in web UI (#34738) 2025-05-21 15:50:45 +00:00
Claire
8c51a8ba94 Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
github-actions[bot]
07741f307e New Crowdin Translations (automated) (#34750) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-21 08:28:04 +00:00
Nick Schonning
d8ea8bc3bb Enable Stylelint color-hex-length (#34310) 2025-05-21 08:05:45 +00:00
Claire
ef87cd6910 Fix incorrect progress value being passed to react-spring in video player (#34740) 2025-05-20 13:12:08 +00:00
Claire
d7cb6068b1 Add ability to reorder server rules from admin interface (#34737) 2025-05-20 12:49:11 +00:00
github-actions[bot]
8ed0408adb New Crowdin Translations (automated) (#34736) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-20 08:13:20 +00:00
renovate[bot]
8ab2c4a9fc chore(deps): update dependency stylelint-config-standard-scss to v15 (#34658) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:46:11 +00:00
diondiondion
4372d17114 fix: Prevent long link names in admin sidebar from being truncated (#34727) 2025-05-19 12:36:46 +00:00
renovate[bot]
feb4e0a007 fix(deps): update dependency @react-spring/web to v10 (#34693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:35:10 +00:00