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
renovate[bot]
69ee043f9d Update dependency rspec-rails to v8.0.2 (#35750) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 09:53:52 +00:00
renovate[bot]
28b5477c6f Update dependency rubocop-rails to v2.33.1 (#35747) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 09:27:07 +00:00
Matt Jankowski
5ee83a680b Update stoplight to version 5.3.1 (#35129) 2025-08-12 08:15:22 +00:00
renovate[bot]
d9d7914a8d Update dependency vite to v7.1.2 (#35746) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-12 07:44:48 +00:00
github-actions[bot]
ca3d67e88d New Crowdin Translations (automated) (#35745) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-12 07:40:37 +00:00
Matt Jankowski
61f0ce654f Update rubocop-rails to version 2.33.0 (#35741) 2025-08-12 07:29:02 +00:00
Renaud Chaput
379f12ea00 Update to Vite 7 (#35598) 2025-08-11 12:35:36 +00:00
Echo
bf15b1d65d Prevent props being added as HTML attributes (#35739) 2025-08-11 12:00:35 +00:00
renovate[bot]
4cabc031e6 Update dependency rubyzip to v3 (#35576) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-11 10:12:14 +00:00
renovate[bot]
9c5b4b2639 Update dependency sass to v1.90.0 (#35695) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-11 08:57:42 +00:00
Claire
8a7e84a475 Add test for Delete of inlined QuoteAuthorization (#35724) 2025-08-11 08:55:23 +00:00
Claire
0e99d428b2 Change serialization of Delete activities for QuoteAuthorization to inline the latter (#35725) 2025-08-11 08:55:18 +00:00
renovate[bot]
dbab3912bd Update dependency hiredis-client to v0.25.2 (#35732) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-11 08:08:40 +00:00
github-actions[bot]
3c6c9d650d New Crowdin Translations (automated) (#35729) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-11 08:08:33 +00:00
Matt Jankowski
b827a0a6a8 Allow CustomEmoji to normalize its own domain (#35726) 2025-08-11 07:33:36 +00:00
Echo
ab0a206d43 [Glitch] Update Redux to handle quote posts 
Port 8ee4b3f906 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-09 23:10:41 +02:00
Claire
11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
 2025-08-09 23:02:43 +02:00
renovate[bot]
ce1680e6f9 Update dependency core-js to v3.45.0 (#35667) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-08 15:32:15 +00:00
Matt Jankowski
b8982cb881 Use around_action to preserve stored location in auth/sessions#destroy (#35716) 2025-08-08 15:31:50 +00:00
renovate[bot]
5d934c2835 Update dependency httplog to v1.7.3 (#35721) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-08 10:06:23 +00:00
David Roetzel
868c46bc76 Add delivery failure handling to FASP jobs (#35723) 2025-08-08 09:46:09 +00:00
github-actions[bot]
1fd147bf2b New Crowdin Translations (automated) (#35720) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-08 09:00:51 +00:00
Echo
8ee4b3f906 Update Redux to handle quote posts (#35715) 2025-08-08 08:44:05 +00:00
Claire
54134a30a7 Merge pull request #3155 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a485f97d21
 2025-08-07 18:51:05 +02:00
Claire
e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
Matt Jankowski
a485f97d21 Replace EmailHelper module with normalizes via model concern (#35702) 2025-08-07 13:47:47 +00:00
Claire
496a5f423e Inline instrument quote post in outgoing QuoteRequest activities (#35713) 2025-08-07 13:19:18 +00:00
Claire
836a2bfee0 Fix handling of inlined instrument in incoming QuoteRequest (#35714) 2025-08-07 12:52:29 +00:00
github-actions[bot]
39a3ffaf2f New Crowdin Translations (automated) (#35708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-07 08:46:11 +00:00
Claire
d4e0784182 Fix quote revocation not being streamed (#35710) 2025-08-07 08:03:15 +00:00
Claire
e615d2f069 Change quote to be fetched with quoted account rather than random follower (#35709) 2025-08-07 08:02:29 +00:00
Claire
9ddb9739d1 Merge pull request #3154 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ac59772dc6
 2025-08-06 23:31:58 +02:00
Claire
9da8c9e07c [Glitch] Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon 
Port 4838085d66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire
4b507c0f05 [Glitch] Add UI for revoking quote posts 
Port 55a98580aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire
dbb2908eeb [Glitch] Fix quote notification filtering and add settings 
Port a4c05c694f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:34:14 +02:00
Claire
235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire
ac59772dc6 Change icon of quote notification mails (#35701) 2025-08-06 15:20:16 +00:00
Claire
4838085d66 Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700) 2025-08-06 14:54:03 +00:00
Claire
9ec99ffef1 Add quote_approval_policy parameter when posting and editing statuses (#35699) 2025-08-06 14:23:12 +00:00
Matt Jankowski
6e48322055 Add spec for CanonicalEmailBlock.matching_email scope (#35692) 2025-08-06 12:19:43 +00:00
Claire
55a98580aa Add UI for revoking quote posts (#35689) 2025-08-06 11:52:56 +00:00
Claire
c8f263c419 Export interaction policies for local posts over ActivityPub (#35697) 2025-08-06 11:31:36 +00:00
github-actions[bot]
6f6e7d8d49 New Crowdin Translations (automated) (#35694) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-06 09:06:22 +00:00
renovate[bot]
fcbd4b7afb Update dependency annotaterb to v4.18.0 (#35676) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-06 08:43:14 +00:00
Matt Jankowski
4c2ddbf2c4 Update rubocop to version 1.79.2 (#35688) 2025-08-06 08:42:53 +00:00
Claire
a4c05c694f Fix quote notification filtering and add settings (#35690) 2025-08-05 16:15:16 +00:00
Matt Jankowski
a968849e9c Use normalizes api for UsernameBlock username change (#35606) 2025-08-05 14:10:28 +00:00
Claire
5c1456c97f Merge pull request #3153 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ffeb5da991
 2025-08-05 16:08:50 +02:00
Claire
3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
Claire
ffeb5da991 Bump version to v4.4.3 (#35687) 2025-08-05 13:32:20 +00:00