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,052 Commits 74 Branches 58 Tags
24e2bd2d6c845cabd255b31f5c24a443d839df97
Commit Graph

4423 Commits

Author SHA1 Message Date
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
Claire
012450e87d Consolidate labels for quote policy settings (#35893) 2025-08-25 12:30:37 +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
Claire
5cac4dfb5c Merge commit 'abe5413638043a52e4fcbb5f16aefd14e76bf96c' into glitch-soc/merge-upstream 2025-08-22 22:52:55 +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
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
Emelia Smith
4f494781c1 Refactor to reuse the one status partial across moderation tools (#35644) 2025-08-21 14:51:11 +00:00
github-actions[bot]
f696f794cf New Crowdin Translations (automated) (#35844) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-21 07:42:45 +00:00
Matt Jankowski
50cf327819 Use debug? query method on httplog initializer check (#35833) 2025-08-20 12:06:35 +00:00
github-actions[bot]
54da7ff12b New Crowdin Translations (automated) (#35829) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-20 08:31:57 +00:00
Claire
71cee3e472 Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency adjacent to one that is only in glitch-soc.
  Updated as upstream did.
 2025-08-19 18:46:12 +02:00
github-actions[bot]
10dc66be64 New Crowdin Translations (automated) (#35816) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-19 06:49:37 +00:00
Claire
8d602df786 Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream 2025-08-18 13:44:06 +02:00
Matt Jankowski
9d15b85d3b Include update in the resources args for api/web/push_subscriptions route (#35801) 2025-08-18 07:35:56 +00:00
github-actions[bot]
a18e6199ef New Crowdin Translations (automated) (#35795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-18 07:03:54 +00:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
github-actions[bot]
25f1a515f8 New Crowdin Translations (automated) (#35788) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-15 07:12:01 +00:00
Claire
2648bbdc51 Add PUT /api/v1/statuses/:status_id/interaction_policy (#35769) 2025-08-13 15:51:16 +00:00
github-actions[bot]
bce4a572cd New Crowdin Translations (automated) (#35759) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-13 07:26:03 +00:00
Matt Jankowski
5ee83a680b Update stoplight to version 5.3.1 (#35129) 2025-08-12 08:15:22 +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
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
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
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
Claire
e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02: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
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
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
Claire
3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
Claire
edece2a197 Merge commit from fork 2025-08-05 14:53:04 +02:00
github-actions[bot]
54fd1c1f9b New Crowdin Translations (automated) (#35674) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 08:19:55 +00:00
Claire
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire
80aadc55df Add missing mailer for quote notifications (#35652) 2025-08-04 10:44:59 +00:00
github-actions[bot]
f68bd21600 New Crowdin Translations (automated) (#35634) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-04 09:20:50 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
Claire
591df1f205 Add support for local quote stamps (#35626) 2025-08-01 14:55:25 +00:00
github-actions[bot]
d09f866daa New Crowdin Translations (automated) (#35622) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-01 07:57:38 +00:00
Claire
2dfdcc7dcb Add API endpoints to view and revoke one's quoted posts (#35578) 2025-07-31 09:36:51 +00:00
Claire
572a0e128d Change quote verification to not bypass authorization flow for mentions (#35528) 2025-07-31 07:39:53 +00:00
github-actions[bot]
2131d1ff23 New Crowdin Translations (automated) (#35611) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-31 07:26:24 +00:00
Claire
e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
github-actions[bot]
1c89309db0 New Crowdin Translations (automated) (#35592) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-30 08:37:33 +00:00
Eugen Rochko
20bbd20ef1 Add ability to block words in usernames (#35407) 2025-07-29 10:19:15 +00:00
github-actions[bot]
d299b0d576 New Crowdin Translations (automated) (#35574) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-29 08:59:00 +00:00
Eugen Rochko
018e5e303f Fix jobs being added to batch after they might already execute (#35496) 2025-07-28 08:20:12 +00:00
github-actions[bot]
a57a9505d4 New Crowdin Translations (automated) (#35537) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-28 08:14:11 +00:00
Claire
8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
Claire
5a88b7f683 Add experimental basic quote post authoring (#35355) 2025-07-25 12:35:24 +00:00
github-actions[bot]
d950298d29 New Crowdin Translations (automated) (#35514) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-25 07:29:48 +00:00
Claire
72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.
 2025-07-24 18:10:38 +02:00