Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 15:13:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,239 Commits 74 Branches 58 Tags
6503287c2dc2c4e27f484eae4cccb570d76b6f8e
Commit Graph

27239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
Claire
198b59ca3e Fix NoMethodError in ActivityPub::FetchFeaturedCollectionService (#34811) 2025-05-26 08:24:46 +00:00
Claire
b3615a803e Remove unnecessary direct dependency to glob (#34809) 2025-05-26 07:42:24 +00:00
renovate[bot]
170668ed69 chore(deps): update dependency selenium-webdriver to v4.33.0 (#34796) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-26 07:41:59 +00: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
Claire
c9c2fbb27d Merge pull request #3074 from ClearlyClaire/glitch-soc/merge-upstream 
[Breaking changes] Merge upstram changes up to a13756148d
 2025-05-25 20:49:36 +02: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
Claire
e0f15a6875 Add cross-account quote to sample data (#34791) 2025-05-24 12:16:28 +00:00
diondiondion
a13756148d fix: Show hint for quotes hidden by filter (#34790) 2025-05-23 15:26:06 +00:00
Claire
304c0417ed Fix handling of inlined featured collections in ActivityPub actor objects (#34789) 2025-05-23 15:01:07 +00:00
diondiondion
3bf128e62a Add dev sample data for post with quote + media (#34787) 2025-05-23 12:52:14 +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
renovate[bot]
229e100dc0 fix(deps): update dependency @vitejs/plugin-react to v4.5.0 (#34784) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-23 07:30:04 +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
Matt Jankowski
bd2988bdf4 Fix Style/PreferredHashMethods cop (#34775) 2025-05-23 07:11:59 +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
David Roetzel
3acd87419c Update to linzer 0.7 (#34765) 2025-05-23 06:43:02 +00:00
Claire
e0ce4b9b6b Fix quotes not being displayed in reblogs (#34773) 2025-05-22 15:23:45 +00:00
Renaud Chaput
ef1bf8e9f2 Fix polyfills naming and tag missing a source (#34768) 2025-05-22 12:54:47 +00:00
diondiondion
12c8a6498c Add "Followers you know" to hovercard (#34769) 2025-05-22 12:46:14 +00:00
Claire
da60acced5 Add boost of remote quote post with fallback link to sample dev data (#34771) 2025-05-22 12:45:24 +00:00
Claire
80849fbfba Fix preview card being fetched even when a status has a quote or media attachment (#34770) 2025-05-22 12:42:16 +00:00
diondiondion
79ccba1758 Add visual indicator & link to nested quote posts (#34766) 2025-05-22 10:39:45 +00:00
renovate[bot]
72356bd5ec chore(deps): update dependency ruby-prof to v1.7.2 (#34764) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-22 10:35:49 +00:00
renovate[bot]
6664f16b14 chore(deps): update dependency rack to v2.2.16 (#34763) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-22 10:35:41 +00:00