Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-28 05:36:44 +00: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
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
Claire
4ecbaea8bb Conditionally bump API version depending on quote post feature flag (#35939) 2025-08-29 10:33:35 +00:00
Matt Jankowski
5f1e6a5886 Fix failure to verify changes in api/v1/accounts/credentials spec (#35951) 2025-08-29 08:14:23 +00:00
github-actions[bot]
97d80265b4 New Crowdin Translations (automated) (#35953) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-29 07:32:22 +00:00
Kazuki Nagasawa
d93572ea90 Fix 404 error after deleting status from detail view (#35800) (#35881) 2025-08-28 20:50:19 +00:00
Claire
3b6afadf55 Merge pull request #3169 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to d880f397df
 2025-08-28 21:47:42 +02:00
diondiondion
5db1bbef69 [Glitch] Add hotkey Q for quoting the currently focused post 
Port 229cbc6a24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-28 20:36:00 +02:00
Claire
c1159fa712 [Glitch] Accomodate longer text in quote/reblog dropdown 
Port b6cd32281f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-28 20:24:46 +02:00
Claire
03e07d88d7 Merge commit 'd880f397dfbe95bb8c3c9ed5730fbba76398df5f' into glitch-soc/merge-upstream 2025-08-28 20:23:39 +02:00
renovate[bot]
d880f397df Update dependency @vitejs/plugin-react to v5.0.2 (#35942) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-28 14:04:38 +00:00
renovate[bot]
3ab2d14782 Update Yarn to v4.9.4 (#35837) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-28 12:39:01 +00:00
diondiondion
229cbc6a24 Add hotkey Q for quoting the currently focused post (#35941) 2025-08-28 12:33:23 +00:00
github-actions[bot]
dccd29fe25 New Crowdin Translations (automated) (#35936) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-28 08:47:16 +00:00