Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 07:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,239 Commits 74 Branches 58 Tags
6503287c2dc2c4e27f484eae4cccb570d76b6f8e
Commit Graph

4615 Commits

Author SHA1 Message Date
Claire
4bc361546e Merge commit '19626ad89f66a32a3ddecb4f43a7b84e3236d287' into glitch-soc/merge-upstream 2025-07-21 21:19:53 +02:00
github-actions[bot]
6bb4113d0a New Crowdin Translations (automated) (#35428) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-21 09:01:34 +00:00
github-actions[bot]
dbd0c3cbd9 New Crowdin Translations (automated) (#35420) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-18 07:52:05 +00:00
Echo
9e6a9efe10 Replace Ruby Vite plugins (#35195) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-07-17 10:04:04 +00:00
github-actions[bot]
7e2d92284c New Crowdin Translations (automated) (#35408) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-17 09:31:22 +00:00
Claire
d6ce7de2d3 Merge commit '331599fa2b335a7b832adcab594a833f09b808f0' into glitch-soc/merge-upstream 
Conflicts:
- `.github/ISSUE_TEMPLATE/1.web_bug_report.yml`:
  We don't use the github features that upstream does, so kept our version.
- `.github/ISSUE_TEMPLATE/2.server_bug_report.yml`:
  We don't use the github features that upstream does, so kept our version.
 2025-07-16 21:31:28 +02:00
github-actions[bot]
331599fa2b New Crowdin Translations (automated) (#35399) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-16 12:24:09 +00:00
Claire
eeffe580d8 Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream 2025-07-15 18:19:32 +02:00
diondiondion
07912a1cb7 Update age limit wording (#35387) 2025-07-15 15:46:44 +00:00
github-actions[bot]
d5e2cf5d3c New Crowdin Translations (automated) (#35379) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-15 08:16:56 +00:00
Claire
ad38168b77 Merge commit '7273f6c03cfc7fb74cc29ca9df610d1efb16417d' into glitch-soc/merge-upstream 2025-07-14 20:50:55 +02:00
github-actions[bot]
a643d9d498 New Crowdin Translations (automated) (#35358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-14 06:21:56 +00:00
Claire
1716f8da71 Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a `features` attribute where glitch-soc had extra ones.
  Added `features` like upstream did.
 2025-07-11 18:53:47 +02:00
github-actions[bot]
b69b5ba775 New Crowdin Translations (automated) (#35344) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-11 08:14:39 +00:00
github-actions[bot]
b363a3651d New Crowdin Translations (automated) (#35335) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-10 07:23:27 +00:00
Claire
e2a867507c Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream 2025-07-10 01:10:32 +02:00
David Roetzel
786b12e379 Relax error restriction in initializer (#35321) 2025-07-09 14:22:47 +00:00
github-actions[bot]
76c1446416 New Crowdin Translations (automated) (#35310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-09 09:10:55 +00:00
Claire
8bd2c87399 Fix support for special characters in various environment variables (#35314) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2025-07-09 08:58:41 +00:00
Claire
f7d1d73073 Merge commit 'b628a98d323902cdcc08fb8d612887dff4dbcd89' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a new user setting, directly next to a glitch-soc-only one.
  The upstream setting would actually replace the glitch-soc one but it is not
  fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Ditto.
- `docker-compose.yml`:
  Conflict due to different registry names. Updated the version while keeping
  glitch-soc's registry.
 2025-07-08 17:27:19 +02:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Miguel Landaeta
d8fa807998 Bump linzer to 0.7.7 (#35258) 2025-07-08 13:04:16 +00:00
Echo
ef66d8379c Add option to set emoji preferences behind feature flag (#35282) 2025-07-08 10:51:11 +00:00
github-actions[bot]
71b2120e5c New Crowdin Translations (automated) (#35286) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-08 09:22:38 +00:00
github-actions[bot]
f6b2609353 New Crowdin Translations (automated) (#35269) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-07 08:21:51 +00:00
Claire
1ebb87a6a8 Fix incorrect name in scheduler configuration (#35263) 2025-07-04 07:51:01 +00:00
github-actions[bot]
83660ee381 New Crowdin Translations (automated) (#35261) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 07:34:54 +00:00
github-actions[bot]
c66c5fd73d New Crowdin Translations (automated) (#35250) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-03 09:47:57 +00:00
github-actions[bot]
6f1135d763 New Crowdin Translations (automated) (#35238) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-02 09:17:03 +00:00
Claire
98e90b7c1f Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream 2025-07-01 18:47:15 +02:00
github-actions[bot]
dd064aaa36 New Crowdin Translations (automated) (#35224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-01 09:02:26 +00:00
Claire
2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6 Add optional bulk mailer settings (#35203) 2025-06-30 14:49:14 +00:00
David Roetzel
bae258925c Persist follow recommendations from FASP (#35218) 2025-06-30 13:39:36 +00:00
github-actions[bot]
8782e860b6 New Crowdin Translations (automated) (#35208) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-30 09:33:15 +00:00
github-actions[bot]
6d017dbf10 New Crowdin Translations (automated) (#35202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-27 08:37:39 +00:00
Claire
f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.
 2025-06-26 18:04:37 +02:00
Eugen Rochko
1804a87193 Change terms of service generator to not be displayed (#35127) 2025-06-26 13:26:41 +00:00
David Roetzel
48451b782d Move email env var reading to yml files (#35191) 2025-06-26 12:18:30 +00:00
github-actions[bot]
a9f2ec45da New Crowdin Translations (automated) (#35189) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-26 08:40:39 +00:00
Claire
c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
 2025-06-25 19:29:09 +02:00
Matt Jankowski
8285194451 Move layout setup for OAuth views to controllers (#35176) 2025-06-25 13:26:17 +00:00
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
github-actions[bot]
0f9f27972d New Crowdin Translations (automated) (#35165) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-25 08:05:57 +00:00
Matt Jankowski
9f16f41678 Remove patch for unsupported redis version (#35155) 2025-06-25 07:53:38 +00:00
Matt Jankowski
47fda2df2c Update OAuth inflection to match spec (#35160) 2025-06-25 07:52:30 +00:00
Claire
93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
Claire
9fccf0a8c6 Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream 2025-06-24 20:45:46 +02:00
Matt Jankowski
fd902c04f7 Use config_for for omniauth enabled values (#35015) 2025-06-24 09:32:13 +00:00
github-actions[bot]
e5aa8c1ff3 New Crowdin Translations (automated) (#35090) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-23 08:43:53 +00:00