Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,783 Commits 74 Branches 58 Tags
07f5573cd6bc3f56a8e48e795ad309829d3f3ea4
Commit Graph

4368 Commits

Author SHA1 Message Date
Claire
7c46fdfbf1 Merge commit '8965e1bfa9ce958ab16083a555ec6677b5f0f690' into glitch-soc/merge-4.4 2025-10-15 11:16:53 +02:00
Jonathan de Jong
cef2c50a71 Fix allow_referrer_origin typo (#36460) 2025-10-14 17:15:58 +02:00
Claire
07dea4e140 Merge commit 'e4bdbccba802318ebde6ab17f5adc1959bd82374' into glitch-soc/merge-4.4 2025-10-10 19:19:16 +02:00
github-actions[bot]
3c2570c88a New Crowdin Translations for stable-4.4 (automated) (#3226) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-10 19:08:08 +02:00
github-actions[bot]
e4bdbccba8 New Crowdin Translations for stable-4.4 (automated) (#36431) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-10 18:19:25 +02:00
Claire
19c89f1bbd Merge commit 'c966d756007e0e4c4eb020055c999e4cf7a07ed0' into glitch-soc/merge-4.4 2025-09-16 14:14:05 +02:00
github-actions[bot]
1ab5ea9bfb New Crowdin Translations for stable-4.4 (automated) (#36122) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-15 14:31:53 +02:00
Claire
00c61317d3 Merge remote-tracking branch 'upstream/stable-4.4' into HEAD 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.
 2025-09-04 18:33:21 +02:00
Emelia Smith
1137a0ca3a Support displaying polls in Admin UI (#35933) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-04 10:45:54 +02:00
Claire
1a1a23f6f0 Consolidate labels for quote policy settings (#35893) 2025-09-04 10:45:54 +02:00
Matt Jankowski
36974aaa99 Use debug? query method on httplog initializer check (#35833) 2025-09-04 10:45:54 +02:00
Matt Jankowski
97f118013a Include update in the resources args for api/web/push_subscriptions route (#35801) 2025-09-04 10:45:54 +02:00
Emelia Smith
cbb9a4dbe3 Refactor to reuse the one status partial across moderation tools (#35644) 2025-09-04 10:45:54 +02:00
Claire
1ed3e4cc77 Merge commit '5478ef9b32be0c7ac8f86330760485a7531d218a' into glitch-soc/backports-4.4 2025-08-05 15:24:44 +02:00
Claire
e2592419d9 Merge commit from fork 2025-08-05 14:53:04 +02:00
github-actions[bot]
e330447b0e New Crowdin Translations for stable-4.4 (automated) (#35681) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 14:02:35 +02:00
Claire
fcb7917344 Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4 
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.
 2025-08-04 21:48:37 +02:00
Claire
6ff4e83937 Change quote verification to not bypass authorization flow for mentions (#35528) 2025-08-01 11:34:27 +02:00
Claire
e69c1479a8 Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4 2025-07-23 18:10:05 +02:00
github-actions[bot]
77d2cdb302 New Crowdin Translations for stable-4.4 (automated) (#35477) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-23 16:28:50 +02:00
diondiondion
77fe044f03 Update age limit wording (#35387) 2025-07-23 16:08:43 +02:00
Claire
ec6f93ae45 Merge commit '609a40181e0f3f505707d196985dfb78ab3b3f88' into glitch-soc/merge-4.4 2025-07-09 17:31:28 +02:00
David Roetzel
fb3ff194b5 Relax error restriction in initializer (#35321) 2025-07-09 17:16:57 +02:00
Claire
1151b05c2d Fix support for special characters in various environment variables (#35314) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2025-07-09 17:16:57 +02:00
Claire
bd442485d0 Merge commit '333a17a478f0ddcee4115a50f01077cb1dc5c22e' into glitch-soc/merge-4.4 2025-07-08 13:13:07 +02:00
github-actions[bot]
388e09e1a3 New Crowdin Translations for stable-4.4 (automated) (#35288) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-08 11:22:46 +02:00
github-actions[bot]
2db8a328cd New Crowdin Translations (automated) (#35269) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-07 17:48:13 +02:00
Claire
385dd5ea37 Merge commit '0c5ce23ae496af26b96aaab742800af93f552f44' into glitch-soc/merge-4.4 2025-07-04 17:56:10 +02:00
Claire
0c5ce23ae4 Fix incorrect name in scheduler configuration (#35263) 2025-07-04 15:10:17 +02:00
github-actions[bot]
cb937a920e New Crowdin Translations (automated) (#35261) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 15:10:17 +02:00
github-actions[bot]
000ff9c05f New Crowdin Translations (automated) (#35250) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 15:10:17 +02:00
github-actions[bot]
07b4fa55c8 New Crowdin Translations (automated) (#35238) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 15:10:17 +02: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