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,287 Commits 74 Branches 58 Tags
af360df59bc5faa9577478412940bd3688e0cff4
Commit Graph

4465 Commits

Author SHA1 Message Date
Claire
af360df59b Merge commit '48005c55fffd1540105ca53870da64f742a0f7fc' into glitch-soc/merge-upstream 2025-09-18 19:19:36 +02:00
github-actions[bot]
bb3f9ed13b New Crowdin Translations (automated) (#36160) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-18 08:17:25 +00:00
Claire
210786efd8 Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream 2025-09-17 18:17:18 +02:00
github-actions[bot]
ff03938808 New Crowdin Translations (automated) (#36143) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-17 07:27:03 +00:00
Claire
26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.
 2025-09-16 18:30:30 +02:00
github-actions[bot]
96d0f6f049 New Crowdin Translations (automated) (#36133) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-16 09:43:02 +00:00
Claire
cc52833296 Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream 2025-09-15 18:39:09 +02:00
github-actions[bot]
93c977eb3d New Crowdin Translations (automated) (#36105) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-15 08:28:25 +00:00
Claire
5da295fa4d Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream 2025-09-13 11:12:22 +02:00
Eugen Rochko
30b31a89e6 Add schema.org markup to SEO-enabled posts (#36075) 2025-09-12 09:12:07 +00:00
github-actions[bot]
b59e06fba7 New Crowdin Translations (automated) (#36092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-12 09:04:44 +00:00
Claire
9f97df84da Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream 2025-09-11 21:20:15 +02:00
diondiondion
872044484c Update labels in Posting defaults settings (#36084) 2025-09-11 14:04:15 +00:00
Claire
128a69c1f4 Merge commit '75f78244d5df52cc8242b6a7c6b8d1531963aa63' into glitch-soc/merge-upstream 2025-09-11 12:13:47 +02:00
github-actions[bot]
75f78244d5 New Crowdin Translations (automated) (#36082) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-11 09:39:51 +00:00
Claire
06f45a2046 Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually adjacent to glitch-soc-only ones.
  Updated them as upstream did.
 2025-09-10 18:11:12 +02:00
github-actions[bot]
eb118d8523 New Crowdin Translations (automated) (#36076) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-10 08:42:44 +00:00
Claire
e1dc960219 Rework FEP-7888 implementation (#36064) 2025-09-09 18:27:30 +00:00
github-actions[bot]
3c79c512fe New Crowdin Translations (automated) (#36063) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-09 07:42:52 +00:00
github-actions[bot]
e9e107c5a5 New Crowdin Translations (automated) (#36045) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-08 13:04:38 +00:00
Jesse Karmani
65b4a0a6f1 Implement FEP 7888: Part 1 - publish conversation context (#35959) 2025-09-05 19:28:29 +00:00
Claire
6fc9febb47 Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream 2025-09-05 20:03:42 +02:00
Claire
279405f2a7 Fix incorrect change of unlisted source strings (#36033) 2025-09-05 08:34:14 +00:00
github-actions[bot]
dd6bd681ea New Crowdin Translations (automated) (#36029) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-05 08:14:25 +00:00
github-actions[bot]
5cb85acf2b New Crowdin Translations (automated) (#36015) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-04 09:41:16 +00: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
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
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
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
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
Claire
ab698ff521 Move posting defaults to their own preferences sub-category (#35966) 2025-09-01 08:31:07 +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
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
6abe6cdef5 Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream 2025-08-29 18:21:28 +02: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
Claire
03e07d88d7 Merge commit 'd880f397dfbe95bb8c3c9ed5730fbba76398df5f' into glitch-soc/merge-upstream 2025-08-28 20:23:39 +02: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
Claire
884d7996b1 Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream 2025-08-27 18:13:03 +02:00
github-actions[bot]
8dcd195527 New Crowdin Translations (automated) (#35922) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-27 08:13:21 +00:00
Claire
7e25f6b606 Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream 2025-08-26 19:07:52 +02: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
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
3c17ccab37 Rearrange posting defaults settings (#35896) 2025-08-25 15:50:22 +00: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