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

27439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
7f98a6703e
Merge pull request #3345 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9b5986b36e86d50d19b68b10788b3316012894c3
 2026-01-13 18:21:18 +01:00
Claire
e33a8d5bfb Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.
 2026-01-13 18:01:53 +01:00
Shlee
9b5986b36e
Fix quote_approval_policy being reset to user defaults when omitted in status update (#37436) 2026-01-13 10:40:08 +00:00
Claire
9332f48abe
Simplify status batch removal SQL query (#37469) 2026-01-13 10:18:26 +00:00
renovate[bot]
f8b8fa16f5
Update dependency pino to v10.1.1 (#37443) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 09:18:34 +00:00
github-actions[bot]
6cb533311a
New Crowdin Translations (automated) (#37466) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-13 09:14:27 +00:00
renovate[bot]
a63a0db568
Update dependency postcss-preset-env to v10.6.1 (#37457) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 09:03:59 +00:00
renovate[bot]
972ed73062
Update DefinitelyTyped types (non-major) (#37456) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-13 09:03:56 +00:00
Claire
ca3c3eada6
Merge pull request #3344 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ed17b3a7ec52c0421ae2483a8e08431316f08b1c
 2026-01-12 21:37:32 +01:00
Claire
478462ab25 Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream 2026-01-12 21:00:14 +01:00
renovate[bot]
ed17b3a7ec
Update dependency use-debounce to v10.1.0 (#37432) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-12 10:09:25 +00:00
renovate[bot]
aa3d76999d
Update dependency ioredis to v5.9.1 (#37388) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-12 10:09:04 +00:00
renovate[bot]
012c62132f
Update dependency sidekiq-unique-jobs to v8.0.13 (#37408) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-12 09:55:12 +00:00
github-actions[bot]
8f70cfc8b1
New Crowdin Translations (automated) (#37447) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-12 09:54:19 +00:00
Matt Jankowski
0fb4e26cfe
Add details to JS browser error spec failure helpers (#37441) 2026-01-12 09:38:00 +00:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections (#37434) 2026-01-12 08:39:25 +00:00
github-actions[bot]
6541d7ed39
New Crowdin translations (#3335) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-10 19:47:20 +01:00
Claire
9183909ef4
Merge pull request #3343 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7
 2026-01-10 19:47:05 +01:00
Echo
aff69de399 [Glitch] Fix bug with how Emojibase wasn't stripping characters 
Port a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:55 +01:00
diondiondion
18d4606cce [Glitch] Further clean up types for the card object 
Port 973fef4b697428c7e9f440e9d67fcdc027cff7be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:34 +01:00
Echo
124d6e37eb [Glitch] Emoji: Adds search 
Port 628fc9b95b064f7feba7f54f3c4146210828f18d to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:18:05 +01:00
Echo
c5fd0d47da [Glitch] Remove trailing variation selector code for legacy emojis 
Port f254b4706731fd5921047c7c95f64f71d560d494 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:17:30 +01:00
Joshua Rogers
9d33d43006 [Glitch] Fix modal closeModal ignoreFocus payload type 
Port 25053db22ba1e7c6ea1fb08f4a18b95305305d42 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:15:12 +01:00
Echo
bb640bd845 [Glitch] Video modals should not be pushed down on mobile 
Port de7b405e55e9ad95e5f624e6992fc72944189496 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-10 13:14:49 +01:00
Claire
d7254ecec4 Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream 2026-01-10 13:12:36 +01:00
Claire
3c1bf72e1a
Fix custom emojis not being rendered in status prepend (#3342) 2026-01-10 13:11:50 +01:00
Echo
a4b8b9fe98
Fix bug with how Emojibase wasn't stripping characters (#37442) 2026-01-09 18:38:22 +00:00
Joshua Rogers
b55982cc1a
Fix Vary parsing in cache control enforcement (#37426) 2026-01-09 16:21:18 +00:00
Joshua Rogers
b35b3a8bcc
Fix arg order for non_matching_uri_hosts? call in QuoteRequest (#37425) 2026-01-09 16:21:05 +00:00
Joshua Rogers
48ce49260d
Fix thread-unsafe ActivityPub activity dispatch (#37423) 2026-01-09 16:20:59 +00:00
Shlee
f97a015cf9
SharedConnectionPool - NoMethodError: undefined method 'site' for Integer (#37374) 2026-01-09 16:20:50 +00:00
renovate[bot]
1211bbc064
Update dependency hiredis-client to v0.26.3 (#37404) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-09 16:20:33 +00:00
diondiondion
973fef4b69
Further clean up types for the card object (#37023) 2026-01-09 14:40:27 +00:00
Echo
628fc9b95b
Emoji: Adds search (#37418) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-09 10:37:14 +00:00
Joshua Rogers
25053db22b
Fix modal closeModal ignoreFocus payload type (#37424) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-01-08 13:22:31 +00:00
github-actions[bot]
780c6378e0
New Crowdin Translations (automated) (#37407) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-01-08 11:18:50 +00:00
renovate[bot]
13fcb6d2f1
Update dependency ws to v8.19.0 (#37397) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-08 10:58:09 +00:00
Shlee
e0cca5c3ba
Fix SignatureParser accepting duplicate parameters in HTTP Signature header (#37375) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-01-08 10:47:53 +00:00
Echo
de7b405e55
Video modals should not be pushed down on mobile (#37421) 2026-01-08 09:44:17 +00:00
Essem
5c358ceaf1
Merge pull request #3340 from TheEssem/fix/quote-cw-fallback-md 
Fix quotes with only CWs not having fallback link when posting with other content types
 2026-01-07 21:39:27 +01:00
David Roetzel
aa2110025e
Fix URI generation for reblogs by accounts with numerical AP ids (#37415) 2026-01-07 15:39:22 +00:00
Claire
bdcdd539f6
Fix unnecessary downcasing of some words in moderation/settings interface (#37364) 2026-01-07 15:34:39 +00:00
renovate[bot]
f840d7bf9f
Update dependency sass to v1.97.2 (#37395) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-01-07 14:36:26 +00:00
Matt Jankowski
dd26964f1b
Use bundler version 4.0.3 (#37392) 2026-01-07 14:36:21 +00:00
Claire
29950a120d
Merge pull request #3339 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9fe14a30724e18425aedaba59ca63c63d8b14083
 2026-01-07 15:15:28 +01:00
Claire
aa6ec435d2 Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream 2026-01-07 14:53:51 +01:00
Claire
9fe14a3072
Bump version to v4.5.4 (#37413) 2026-01-07 13:40:06 +00:00
Claire
0f79e29188
Merge commit from fork 2026-01-07 14:15:14 +01:00
Claire
0b1b98c4f2
Merge commit from fork 2026-01-07 14:14:42 +01:00
Claire
84128e1526
Downgrade sidekiq-unique-jobs (#37402) 2026-01-07 09:00:16 +00:00