Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,947 Commits 74 Branches 58 Tags
902b5a169c2a830d175465e5f3358ac7e60590e7
Commit Graph

4568 Commits

Author SHA1 Message Date
Claire
e0d7230f97 Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream 2025-11-14 18:19:00 +01:00
github-actions[bot]
ebc99cd597 New Crowdin Translations (automated) (#36893) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-14 15:57:35 +00:00
Matt Jankowski
f8ffb85566 Use date attribute for date of birth (#36039) 2025-11-14 15:17:53 +00:00
github-actions[bot]
f243a00b90 New Crowdin Translations (automated) (#36875) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-14 10:27:20 +00:00
Claire
bebc79d160 Merge commit '98c8c1ebd278f59e97c7d17628e7710cd4c933d4' into glitch-soc/merge-upstream 2025-11-13 18:12:49 +01:00
github-actions[bot]
3f292e0f5b New Crowdin Translations (automated) (#36858) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-13 10:18:16 +00:00
Claire
9525134c28 Merge commit '7e7f63a2efc83edd7c59a12e55eaab9509a4c15b' into glitch-soc/merge-upstream 2025-11-12 18:11:41 +01:00
github-actions[bot]
ff0fca018a New Crowdin Translations (automated) (#36838) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-12 10:24:50 +00:00
Claire
12ac3317aa Merge pull request #3273 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b5a2fe715d
 2025-11-12 09:49:33 +01:00
Claire
48146e5371 Merge commit 'b5a2fe715d158d5fdf4ad9ddef0787b781b4da6e' into glitch-soc/merge-upstream 2025-11-11 20:22:04 +01:00
Claire
565f437f93 Merge pull request #3230 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2025-11-11 12:51:18 +01:00
Claire
095a9571e2 Update simple_form.no.yml 2025-11-11 12:15:55 +01:00
Claire
7ca2a7d9d6 Update no.yml 2025-11-11 12:15:43 +01:00
github-actions[bot]
391c77f277 New Crowdin Translations (automated) (#36820) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-11 08:38:02 +00:00
Claire
d31aaf9ed8 Merge commit '1c3e7545cb6137025a6efd208d195352c54ffda8' into glitch-soc/merge-upstream 2025-11-10 22:18:01 +01:00
github-actions[bot]
b0790d828c New Crowdin Translations (automated) (#36786) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-10 10:06:07 +00:00
GitHub Actions
91d17b5891 New Crowdin translations 2025-11-09 04:34:42 +00:00
Claire
c1ef6e31cb Merge commit '441eb895371cf8ed6a5b8e294367bbbfd0f4c037' into glitch-soc/merge-upstream 2025-11-08 10:44:43 +01:00
Matt Jankowski
c7dc5767d3 Rely on puma default environment setting (#36760) 2025-11-07 10:06:22 +00:00
Matt Jankowski
6833878f95 Clarify hint for bootstrap account instructions (#36771) 2025-11-07 10:05:52 +00:00
github-actions[bot]
dcf7fc1028 New Crowdin Translations (automated) (#36777) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-07 08:34:18 +00:00
Matt Jankowski
0d48005b8a Remove legacy AR connection boot from puma config (#36757) 2025-11-06 14:36:23 +00:00
github-actions[bot]
15c33a16f7 New Crowdin Translations (automated) (#36749) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-06 13:55:37 +00:00
Claire
58b29be439 Merge commit '58b3fc03796dbde54dbba9a4c554c2d8d24f81fd' into glitch-soc/merge-upstream 2025-11-06 12:35:04 +01:00
Josh Soref
50e1320c8d Improve account migration warnings (#20387) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-11-05 15:27:40 +00:00
github-actions[bot]
3aeae8cafd New Crowdin Translations (automated) (#36727) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-05 13:20:34 +00:00
Claire
a7ba4ba446 Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream 2025-11-04 20:38:24 +01:00
mkljczk
afd5d5c2e5 fix spelling (#35738) 2025-11-04 16:49:12 +00:00
github-actions[bot]
e5fbb49033 New Crowdin Translations (automated) (#36697) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-04 08:10:20 +00:00
Claire
8d1208224f Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream 2025-11-03 21:04:45 +01:00
Rachael Wright-Munn
d1f57822af Move "Privacy and reach" from "Public profile" to top-level navigation (#27294) 2025-11-03 17:56:17 +00:00
Claire
9b3e92bf17 Prevent creation of Private Mentions quoting someone who is not mentioned (#36689) 2025-11-03 14:16:25 +00:00
github-actions[bot]
61c0daffc9 New Crowdin Translations (automated) (#36676) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-03 12:21:04 +00:00
Claire
6ff4dad89d Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream 2025-10-31 18:03:21 +01:00
github-actions[bot]
d47ca1cc36 New Crowdin Translations (automated) (#36660) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-31 10:24:16 +00:00
github-actions[bot]
a77038b288 New Crowdin Translations (automated) (#36641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-30 07:52:39 +00:00
Claire
002e592667 Merge commit '51877081b435b38e1c5bd449087279469fa7c667' into glitch-soc/merge-upstream 2025-10-29 12:24:49 +01:00
github-actions[bot]
7b66eefd3e New Crowdin Translations (automated) (#36632) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-29 10:13:42 +00:00
Claire
48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.
 2025-10-28 22:10:12 +01:00
Claire
5f3f75559f Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream 2025-10-28 20:25:09 +01:00
github-actions[bot]
5d00ae7eb3 New Crowdin Translations (automated) (#36617) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-28 08:29:36 +00:00
Renaud Chaput
779a1f8448 Add a new setting to choose the server landing page (#36588) 2025-10-27 10:16:59 +00:00
github-actions[bot]
e40ca321ed New Crowdin Translations (automated) (#36590) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-27 09:45:37 +00:00
Claire
deed31ba8c Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
 2025-10-23 18:33:52 +02:00
github-actions[bot]
f7b99cd48a New Crowdin Translations (automated) (#36569) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-23 09:29:02 +00:00
Claire
7774cd6670 Add disabled setting for live and topic feeds, as well as user permission to bypass that (#36563) 2025-10-23 08:37:05 +00:00
Claire
ee9a15031b Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream 2025-10-22 18:06:32 +02:00
belatedly
6adbd9ce52 Fix discovery preamble missing word in EN and EN-GB locales (#36560) 2025-10-22 09:18:02 +00:00
github-actions[bot]
08ae77fd9c New Crowdin Translations (automated) (#36556) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-22 08:24:40 +00:00
Claire
209434cb1d Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream 2025-10-21 18:15:56 +02:00