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

25173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
diondiondion
4c67a70159 [Glitch] Add "Followers you know" to hovercard 
Port 12c8a6498c4e5cf8fc8364d314df1cc8cc66992e 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 6ab96ba647ae51ab3f09636ee10b1cd8e4e20488 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 8ab2c4a9fc71937aba4be9ef55afd1c655fd3f23 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 8c51a8ba94a16ac94c865e37559a6e01e30884a9 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 d8ea8bc3bb1459b6b2d47adcfb47d167a640e7ae 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 ef87cd6910d4d7c625eda5c65b594e17b172b348 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 d7cb6068b1da5850294b42477b6316e029c9d8c9 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 4372d17114f7c2f4a4ead9ce000ddd1b57e88691 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 feb4e0a00758e0ea00579df53e02586a52350dd0 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 24551375cf556dbf8ef86dd508413a1b449ebde9 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
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
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
Andy Piper
68f951b945
Add security policy in CONTRIBUTING, update year refs. (#34761) 
Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
 2025-05-22 10:03:26 +00:00
renovate[bot]
f1172ca8fe
chore(deps): update dependency rubocop to v1.75.7 (#34759) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-22 09:59:43 +00:00
renovate[bot]
e9d62b284a
chore(deps): update node.js to 22.16 (#34760) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-22 09:53:20 +00:00
Matt Jankowski
8d4ae81ab4
Remove OTP_SECRET env configuration (#34748) 2025-05-22 09:33:21 +00:00
Renaud Chaput
83dd09d4dc
Fix JS polyfills missing after the Vite switch (#34758) 2025-05-21 20:11:01 +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
Matt Jankowski
f1a6f4333a
Remove redis-namespace gem (#34742) 2025-05-21 15:20:17 +00:00
Matt Jankowski
3a5e310a6d
Remove OTP_SECRET env configuration from setup (#34757) 2025-05-21 15:08:46 +00:00
Claire
8c51a8ba94
Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
diondiondion
977164decc
docs: Update DEVELOPMENT.md to include vips project dependency (#34753) 2025-05-21 09:17:17 +00:00
Matt Jankowski
67f5122ba6
Use ActiveSupport::TaggedLogging.logger shorthand to set logger in production env (#34746) 2025-05-21 08:50:36 +00:00
renovate[bot]
30ee67e2c6
fix(deps): update dependency @react-spring/web to v10.0.1 (#34752) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-21 08:39:04 +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