Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,351 Commits 74 Branches 58 Tags
ee642289638e92f651d50c923220db4c63d7532a
Commit Graph

26351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Jankowski
27969c3077 Update rubocop to version 1.80.2 (#36007) 2025-09-04 08:14:01 +00:00
Emelia Smith
4c2a2c27c1 Automatically remove invalid Web::PushSubscriptions (#35987) 2025-09-04 08:00:44 +00:00
Claire
14cb5ff881 Add compatibility hack for GoToSocial interaction policies (#36004) 2025-09-03 19:35:43 +00:00
Claire
372b746dbf Merge pull request #3173 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 624c024766
 2025-09-03 17:58:58 +02:00
Claire
705ea99136 Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream added an optional keyword argument where glitch-soc already had one for content-type.
  Added upstream's new option while keeping glitch-soc's.
 2025-09-03 14:39:57 +02:00
diondiondion
bc952ebde9 Add new plain (text-only) button variant (#36002) 2025-09-03 12:34:29 +00:00
renovate[bot]
c1542643f5 fix(deps): update dependency sass to v1.92.0 (#36001) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-03 12:23:00 +00:00
Claire
624c024766 Prepend “RE: <url>” fallback link to Mastodon-authored quote posts (#35971) 2025-09-03 09:35:44 +00:00
github-actions[bot]
927468bce5 New Crowdin Translations (automated) (#35999) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-03 07:57:33 +00:00
Claire
eeb80a926c Merge pull request #3172 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 75fca715e9
 2025-09-02 22:48:32 +02:00
Claire
6a71fffadf [Glitch] Change public self-quotes of private posts to be disallowed 
Port 75fca715e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:19:48 +02:00
Claire
a06e96f99e [Glitch] Change icon variant for quotes 
Port 5d9a9c76fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:18:40 +02:00
Claire
160c29b073 [Glitch] Change wording on quote label when disabled 
Port 0e5cac8c8b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:17:01 +02:00
Bruno Viveiros
a5662c71db [Glitch] fix: YouTube iframe being able to start at a defined time 
Port bdff970a5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:16:37 +02:00
Emelia Smith
c5867cc98d [Glitch] Move 'add more' inside table toolbar on reports 
Port 2138f3e40f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:15:44 +02:00
Emelia Smith
ae6613db55 [Glitch] Fix batch table toolbar displaying under status media 
Port 314d5f0d7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:14:55 +02:00
Emelia Smith
aadbfbb315 [Glitch] Support displaying polls in Admin UI 
Port 15401e6988 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:14:11 +02:00
diondiondion
1db5d85d20 [Glitch] Update Visibility modal copy & preferences link 
Port 6f8187e595 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-02 19:12:23 +02:00
Claire
d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.
 2025-09-02 19:07:51 +02:00
Claire
75fca715e9 Change public self-quotes of private posts to be disallowed (#35975) 2025-09-02 15:48:37 +00:00
Claire
5d9a9c76fb Change icon variant for quotes (#35991) 2025-09-02 13:52:09 +00:00
Claire
0e5cac8c8b Change wording on quote label when disabled (#35990) 2025-09-02 13:41:31 +00:00
fiona
e665cc68f4 Fix handling of edited status with new media and no text (#35970) 2025-09-02 12:25:55 +00:00
Bruno Viveiros
bdff970a5e fix: YouTube iframe being able to start at a defined time (#26584) 2025-09-02 10:04:59 +00:00
renovate[bot]
bf860c39c2 Update dependency vite to v7.1.4 (#35983) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-02 09:21:31 +00:00
renovate[bot]
b829d89757 Update dependency use-debounce to v10.0.6 (#35982) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-02 08:29:24 +00:00
renovate[bot]
5844fd3e3d Update dependency pg to v1.6.2 (#35981) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-02 08:11:39 +00:00
renovate[bot]
f51b733109 Update dependency connection_pool to v2.5.4 (#35980) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-02 08:11:28 +00:00
Emelia Smith
2138f3e40f Move 'add more' inside table toolbar on reports (#35963) 2025-09-02 07:54:58 +00:00
github-actions[bot]
fb736eaed5 New Crowdin Translations (automated) (#35979) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-02 07:41:43 +00:00
Matt Jankowski
786891c333 Remove unused local vars from user mailer warning (#35977) 2025-09-02 07:35:53 +00:00
Eugen Rochko
7fc884ba00 Fix banned text being able to be circumvented via unicode (#35978) 2025-09-02 07:29:03 +00:00
Claire
6e09dd10a7 Fix stale interaction counts being served for quotes over streaming (#35967) 2025-09-01 20:12:20 +00:00
Emelia Smith
314d5f0d7a Fix batch table toolbar displaying under status media (#35962) 2025-09-01 16:02:31 +00:00
Emelia Smith
15401e6988 Support displaying polls in Admin UI (#35933) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-01 14:59:03 +00:00
diondiondion
6f8187e595 Update Visibility modal copy & preferences link (#35969) 2025-09-01 11:17:27 +00:00
Claire
ab698ff521 Move posting defaults to their own preferences sub-category (#35966) 2025-09-01 08:31:07 +00:00
renovate[bot]
f21d9f64db Update Node.js to 22.19 (#35954) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-09-01 07:21:09 +00:00
github-actions[bot]
e95e6064ae New Crowdin Translations (automated) (#35960) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-01 07:20:25 +00:00
Matt Jankowski
70da14871f Remove unused require of rubygems/package from ip blocks CLI class (#35957) 2025-09-01 06:23:39 +00:00
github-actions[bot]
c3b1dc4b1c New Crowdin Translations (automated) (#3103) 
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-31 16:16:20 +02:00
Claire
65723e791f Merge pull request #3170 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 40242fafee
 2025-08-30 16:14:14 +02:00
Claire
a0763483b0 [Glitch] Rename unknown quote policy value to unsupported_policy 
Port 4fa203e69e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-29 18:24:50 +02:00
Kazuki Nagasawa
bf3c53661a [Glitch] Fix 404 error after deleting status from detail view 
Port d93572ea90 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-29 18:24:23 +02:00
Claire
6abe6cdef5 Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream 2025-08-29 18:21:28 +02:00
Matt Jankowski
40242fafee Use partial for severed relationship download area (#35945) 2025-08-29 15:19:59 +00:00
Matt Jankowski
ee4b0a223c Add coverage for Relay model (#35950) 2025-08-29 15:18:52 +00:00
ioflow
3c578dbdcd Fix incorrect RSS feed MIME type in gzip_types directive (#35562) 2025-08-29 14:17:04 +00:00
Claire
4fa203e69e Rename unknown quote policy value to unsupported_policy (#35955) 2025-08-29 13:50:37 +00:00
Claire
8b7685d956 Add default quote policy to API (#35948) 2025-08-29 11:37:20 +00:00