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

4537 Commits

Author SHA1 Message Date
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
github-actions[bot]
469304359a New Crowdin Translations (automated) (#35495) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-24 07:49:09 +00:00
Echo
7f9ad7eabf Enables cross-origin Web Workers (#35483) 2025-07-24 07:14:27 +00:00
Claire
d69c5f1a6e Fix glitch assets not being found 2025-07-23 12:48:45 +02:00
Claire
45d79427c4 Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Conflict because of differently-named theme plugins.
  Updated to go with upstream's changes.
 2025-07-23 12:08:59 +02:00
Claire
5ff0039d7b Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream 2025-07-22 23:17:48 +02:00
Claire
889c0b3a1f Merge commit '9e6a9efe101b36291897ae9fd4dbc5163a6cef38' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream added/updated dependency adjacent to glitch-soc-only dependency.
  Updated as upstream did.
- `vite.config.mts`:
  Upstream reworked the config file while using a different plugin for themes.
  Adapted upstream's changes.
- `yarn.lock`:
  Same as `package.json`
 2025-07-22 23:07:30 +02:00
Echo
0af2c4829f Creates Vite plugin to generate assets file (#35454) 2025-07-22 13:58:04 +00:00
github-actions[bot]
be3dc5b508 New Crowdin Translations (automated) (#35453) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-22 10:10:37 +00:00
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