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

17673 Commits

Author SHA1 Message Date
github-actions[bot]
82670fb5e6
New Crowdin translations (#3500) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-21 17:17:29 +02:00
diondiondion
9d751370d5 [Glitch] Allow adding an account to a collection directly from the profile page 
Port 6e7e8de3435c2a11715eecca97ddd92e1a2df3ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-20 15:48:18 +02:00
Claire
ca427bc176 Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream 2026-05-20 15:43:33 +02:00
Claire
0786c1e57a
Merge commit from fork 2026-05-20 14:38:24 +02:00
Claire
ec2a99341c
Merge commit from fork 
* Refactor `PrivateAddressCheck`

Also ensures IPv4-mapped IPv6 addresses get properly checked no matter the version of `ipaddr`.

* Add some missing IPv6 ranges from `PrivateAddressCheck`
 2026-05-20 14:34:32 +02:00
diondiondion
6e7e8de343
Allow adding an account to a collection directly from the profile page (#39080) 2026-05-20 11:29:41 +00:00
diondiondion
a444a0b572
Accessibility: Add landmark elements to login/sign-up pages (#39098) 2026-05-20 11:28:37 +00:00
Claire
da3cfecb8d [Glitch] Fix custom emoji selection 
Port f28715d3703b3ab860b4735eb86dd3fd1a9a99a8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-20 11:32:28 +02:00
Claire
aaf06a8186 Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream 2026-05-20 11:31:39 +02:00
Claire
6f8558a6b9
Fix Request error when issuing a request which host is an IP address (#39030) 2026-05-20 09:04:50 +00:00
David Roetzel
22203f8aeb
Improve collection item verification (#39096) 2026-05-20 07:55:17 +00:00
Claire
f28715d370
Fix custom emoji selection (#39088) 2026-05-20 07:23:29 +00:00
Echo
358dd0653a [Glitch] Include boosts to restore pinned ordering 
Port dee1dc41aaf6cef15406d7275d766f82e16f64f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-19 20:49:57 +02:00
diondiondion
6db587d78b [Glitch] Ensure quote posts have no collection previews 
Port 655de329906045b4cf4bba9139016c213792f443 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-19 20:49:30 +02:00
Echo
0612de6202 [Glitch] Trigger initial field flow recalculation 
Port 99db6a19104b52c993966294af62cbde1422949a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-19 20:47:07 +02:00
Echo
1aa53eb328 [Glitch] Autosuggest emojis rendering fix 
Port d5a7b383faf9085e88e3c54639aefb026f2b3694 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-19 20:46:27 +02:00
Echo
3f884ada27 [Glitch] Refactor emoji search 
Port 34c91555ae956181e3f45602220a805a3ac7cf9e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-19 20:46:02 +02:00
Claire
0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Echo
dee1dc41aa
Include boosts to restore pinned ordering (#39084) 2026-05-19 15:15:36 +00:00
diondiondion
655de32990
Ensure quote posts have no collection previews (#39082) 2026-05-19 14:14:25 +00:00
Echo
99db6a1910
Trigger initial field flow recalculation (#39079) 2026-05-19 12:58:46 +00:00
Echo
d5a7b383fa
Autosuggest emojis rendering fix (#39077) 2026-05-19 12:22:52 +00:00
Echo
34c91555ae
Refactor emoji search (#39008) 2026-05-19 10:47:45 +00:00
Tan, Kian-ting
b3992e62ed
fix nan-tw not listed in SUPPORTED_LOCALES (#37721) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-19 07:16:50 +00:00
Matt Jankowski
1232b55211
Use mime type symbol to set content_type for custom css response (#37845) 2026-05-19 07:16:24 +00:00
Matt Jankowski
5f33cf0b0a
Extract api/v1/statuses#context to standalone controller (#38348) 2026-05-19 07:15:35 +00:00
github-actions[bot]
eec97e387a
New Crowdin Translations (automated) (#39075) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-19 07:00:03 +00:00
diondiondion
e210a94c24 [Glitch] Allow users to change how accounts are sorted when viewing a collection 
Port c26003af215da7696e2b0dcece7fa695b1be8871 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:46:16 +02:00
Pia B.
2e09ef3f25 [Glitch] Add batch remove for collections in reports 
Port 07a05e1edfc796ac5f9ead4817aa7807e0028384 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:41:50 +02:00
diondiondion
a7741db576 [Glitch] Unify compact button size between variants 
Port 28ae61f34d1d3dfdf906708e9f2533d5ed293739 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:40:33 +02:00
diondiondion
95328ba754 [Glitch] Update content & placement of "sensitive content" warning on collection page 
Port dcb6dbbc86cb293b7661495837ba4cfdce3882b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:38:57 +02:00
Claire
108f8c9881 [Glitch] Nudge users to turn on discoverable when viewing the empty list of collections they are in 
Port 99b72f60ad4ef7f845646767105aa501cd563291 to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:36:52 +02:00
Shlee
06e073480e [Glitch] Fix accounts header banner grayscale 
Port bb94f91f86e0af8b5bf1c15612de2abac244c123 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:36:24 +02:00
Echo
590e304120 [Glitch] Fixes bio spacing when there aren't paragraph tags 
Port cdf48e806dcd27c96b30069f234532ab64a7f5f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:36:04 +02:00
Claire
42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
diondiondion
c26003af21
Allow users to change how accounts are sorted when viewing a collection (#39073) 2026-05-18 16:48:40 +00:00
Pia B.
07a05e1edf
Add batch remove for collections in reports (#39020) 2026-05-18 14:53:40 +00:00
diondiondion
28ae61f34d
Unify compact button size between variants (#39070) 2026-05-18 14:33:23 +00:00
diondiondion
dcb6dbbc86
Update content & placement of "sensitive content" warning on collection page (#39069) 2026-05-18 13:08:41 +00:00
Claire
99b72f60ad
Nudge users to turn on discoverable when viewing the empty list of collections they are in (#39029) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-05-18 12:11:14 +00:00
David Roetzel
db304735bf
Temporary tweak to account background refresh (#39062) 2026-05-18 10:04:28 +00:00
Shlee
bb94f91f86
Fix accounts header banner grayscale (#39042) 2026-05-18 08:46:49 +00:00
Echo
cdf48e806d
Fixes bio spacing when there aren't paragraph tags (#39055) 2026-05-18 08:45:43 +00:00
github-actions[bot]
3294b5777f
New Crowdin Translations (automated) (#39037) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-18 07:26:12 +00:00
Echo
233bc69363 [Glitch] Refactor account header banners 
Port 758db36ec7da7f3e402b5290f06a120e8517ed6d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-13 18:47:43 +02:00
Claire
808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
David Roetzel
8bbde181db
Use the same condition for stale refresh (#39026) 2026-05-13 14:57:25 +00:00
github-actions[bot]
771fdcbb9f
New Crowdin Translations (automated) (#39024) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-05-13 09:08:11 +00:00
Echo
758db36ec7
Refactor account header banners (#38921) 2026-05-13 08:38:17 +00:00
Pia B.
bbb3392dbe
add collections icon to admin report interface (#39009) 2026-05-12 17:46:24 +00:00