Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,066 Commits 74 Branches 58 Tags
7e25f6b606c34e274b5e54dff944f31aa7c190fb
Commit Graph

26066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
7e25f6b606 Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream 2025-08-26 19:07:52 +02:00
Claire
6ad0ddebe4 Fix quotes counting (#35917) 2025-08-26 15:51:56 +00:00
Claire
676300789e Merge pull request #3166 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7aba79ade9
 2025-08-26 17:06:23 +02:00
Claire
3c9bde31f7 Fix WebUI fetching deleted quote in an endless loop (#35909) 2025-08-26 10:07:02 +00:00
Matt Jankowski
a8166d28ed Add coverage for "live TOS" and "no TOS" paths in tos/drafts spec (#35902) 2025-08-26 08:43:43 +00:00
github-actions[bot]
460043a969 New Crowdin Translations (automated) (#35908) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-26 08:40:16 +00:00
Matt Jankowski
4f41b7c089 Relax hard-coded attr names in system specs (#35903) 2025-08-26 08:23:45 +00:00
Claire
33085d9cf5 Get rid of leftover file 2025-08-25 22:24:58 +02:00
Claire
a17db258ea [Glitch] Ensure quote policy is displayed as “Just me” when disabled because of visibility 
Port 7a76f71d99 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-25 22:22:52 +02:00
Claire
c2c0b4f347 [Glitch] Consolidate labels for quote policy settings 
Port 012450e87d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-25 22:21:30 +02:00
Claire
24e2bd2d6c [Glitch] Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option 
Port d8c07be021 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-25 22:20:46 +02:00
Claire
7fcd9184d2 [Glitch] Add quotes_count to statuses stats 
Port 2560242972 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-25 22:18:08 +02:00
diondiondion
2b00895179 [Glitch] Fix broken custom radio buttons & checkboxes in modals 
Port 94ad088482 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-25 22:17:33 +02:00
Claire
e8fe33f273 Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.
 2025-08-25 22:15:28 +02:00
Matt Jankowski
4738a18e52 Use default action of persisted records on edit forms (#35904) 2025-08-25 17:26:25 +00:00
Claire
3c17ccab37 Rearrange posting defaults settings (#35896) 2025-08-25 15:50:22 +00:00
Claire
496370801a Add quotes_count to serializer specs (#35901) 2025-08-25 15:49:52 +00:00
Claire
f3a932d8a1 Add quoted_update notification type (#35820) 2025-08-25 15:44:18 +00:00
Claire
7aba79ade9 Fix quotes_count attribute on Status not being serialized (#35895) 2025-08-25 14:33:25 +00:00
Claire
7a76f71d99 Ensure quote policy is displayed as “Just me” when disabled because of visibility (#35894) 2025-08-25 13:08:37 +00:00
Claire
012450e87d Consolidate labels for quote policy settings (#35893) 2025-08-25 12:30:37 +00:00
Claire
d8c07be021 Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option (#35892) 2025-08-25 12:25:35 +00:00
Claire
2560242972 Add quotes_count to statuses stats (#35832) 2025-08-25 12:21:28 +00:00
diondiondion
94ad088482 Fix broken custom radio buttons & checkboxes in modals (#35891) 2025-08-25 09:12:46 +00:00
github-actions[bot]
b771fc0880 New Crowdin Translations (automated) (#35878) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-25 06:54:53 +00:00
Shlee
61a21d6a36 Add crossorigin back to inert css (regression? of #30687) (#35876) 2025-08-25 06:54:47 +00:00
renovate[bot]
d85743576c Update dependency vite-plugin-svgr to v4.5.0 (#35885) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-25 06:46:10 +00:00
renovate[bot]
a1ca52ed8f Update dependency @types/react to v18.3.24 (#35888) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-25 06:43:24 +00:00
Claire
95709ce88b Merge pull request #3165 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f6e822e1f5
 2025-08-24 21:50:33 +02:00
Claire
a44b4e220e Merge commit 'f6e822e1f5c18553db246991ebfb8658acaef59f' into glitch-soc/merge-upstream 2025-08-24 11:43:25 +02:00
Claire
c0a48f082c Merge upstream changes up to abe5413638 (#3164) 
* Update dependency vite-plugin-pwa to v1.0.3 (#35830)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (#35829)

Co-authored-by: GitHub Actions <noreply@github.com>

* Status quote button (#35822)

* Use `debug?` query method on httplog initializer check (#35833)

* Fix display of quotes in threads in WebUI (#35834)

* Update dependency ruby-vips to v2.2.5 (#35836)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Disable `Metrics/*` cops (#35000)

* Update dependency core-js to v3.45.1 (#35843)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (#35844)

Co-authored-by: GitHub Actions <noreply@github.com>

* Update dependency vite-plugin-static-copy to v3.1.2 (#35846)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency rubyzip to v3.0.2 (#35845)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Composer quote improvements (#35835)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>

* Refactor to reuse the one status partial across moderation tools (#35644)

* Fix layout shift caused by "Who to follow" widget (#35861)

* Improvements for keyboard navigation in feeds (#35853)

* Improve feed item focus outlines (#35864)

* Visibility Modal fixes (#35865)

* New Crowdin Translations (automated) (#35859)

Co-authored-by: GitHub Actions <noreply@github.com>

* [Glitch] Status quote button

Port 8268323d7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix display of quotes in threads in WebUI

Port 45ec4c93c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Composer quote improvements

Port f85f0eee1b to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Refactor to reuse the one status partial across moderation tools

Port 4f494781c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix layout shift caused by "Who to follow" widget

Port 511e10df34 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Improvements for keyboard navigation in feeds

Port 118c30fbc7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Improve feed item focus outlines

Port a1c7b853ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Visibility Modal fixes

Port 4df50b9c7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: diondiondion <mail@diondiondion.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2025-08-24 11:42:35 +02:00
Claire
f6e822e1f5 Fix issue with Stoplight 5.3 and DragonflyDB (#35868) 2025-08-22 23:59:25 +00:00
Claire
3fd629cf84 Do not mark remote quotes of local posts as approved before request (#35860) 2025-08-22 23:59:18 +00:00
Matt Jankowski
20bc34ca52 Rely on pluck for the SELECT in RuleTranslation.languages (#35826) 2025-08-22 23:58:40 +00:00
Echo
3cc6f8813a [Glitch] Visibility Modal fixes 
Port 4df50b9c7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:12:02 +02:00
diondiondion
f7cd193390 [Glitch] Improve feed item focus outlines 
Port a1c7b853ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:11:22 +02:00
diondiondion
e9c1ffeb9a [Glitch] Improvements for keyboard navigation in feeds 
Port 118c30fbc7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:08:56 +02:00
diondiondion
bae04bd303 [Glitch] Fix layout shift caused by "Who to follow" widget 
Port 511e10df34 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:03:39 +02:00
Emelia Smith
b52b744e6d [Glitch] Refactor to reuse the one status partial across moderation tools 
Port 4f494781c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 23:00:33 +02:00
Echo
be78b64948 [Glitch] Composer quote improvements 
Port f85f0eee1b to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 22:58:39 +02:00
Claire
5cac4dfb5c Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream 2025-08-22 22:52:55 +02:00
Claire
0a0f57f3ec [Glitch] Fix display of quotes in threads in WebUI 
Port 45ec4c93c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 22:46:03 +02:00
Echo
4e7b270365 [Glitch] Status quote button 
Port 8268323d7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-22 22:45:40 +02:00
Claire
02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.
 2025-08-22 22:33:11 +02:00
Claire
48a71e6ad2 Change glitch flavor to show approximate reply count by default (#3157) 2025-08-22 22:29:21 +02:00
github-actions[bot]
abe5413638 New Crowdin Translations (automated) (#35859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-22 14:53:27 +00:00
Echo
4df50b9c7e Visibility Modal fixes (#35865) 2025-08-22 12:34:37 +00:00
diondiondion
a1c7b853ec Improve feed item focus outlines (#35864) 2025-08-22 12:10:07 +00:00
diondiondion
118c30fbc7 Improvements for keyboard navigation in feeds (#35853) 2025-08-22 09:57:39 +00:00
diondiondion
511e10df34 Fix layout shift caused by "Who to follow" widget (#35861) 2025-08-22 09:44:10 +00:00