Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,640 Commits 74 Branches 58 Tags
a0aa5fe8ea2df69d11c58b702884c193a98b4704
Commit Graph

4519 Commits

Author SHA1 Message Date
Claire
209434cb1d Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream 2025-10-21 18:15:56 +02:00
Renaud Chaput
b80ec3721d Drop support for PostgreSQL 13 (#36540) 2025-10-21 14:26:00 +00:00
Claire
5674100f0b Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream 2025-10-21 15:57:43 +02:00
github-actions[bot]
2b9e4294fe New Crowdin Translations (automated) (#36538) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-21 08:50:24 +00:00
Claire
9080083263 Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream 2025-10-20 21:37:50 +02:00
github-actions[bot]
82483ed8b0 New Crowdin Translations (automated) (#36520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-20 10:10:37 +00:00
Claire
22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
 2025-10-17 19:00:18 +02:00
Claire
4c0104084d Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream 2025-10-17 18:36:27 +02:00
diondiondion
6dad80eb8c Add new "quick boosting" setting (#36516) 2025-10-17 13:02:47 +00:00
github-actions[bot]
ccac6da3e8 New Crowdin Translations (automated) (#36513) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-17 08:41:07 +00:00
Claire
323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
diondiondion
20961c7538 Add keyboard shortcut info banner to the boosting preferences section (#36506) 2025-10-16 14:53:23 +00:00
Emelia Smith
210b389643 Implement quote posts in Moderator UI (#35964) 2025-10-16 13:40:24 +00:00
github-actions[bot]
5404f92cee New Crowdin Translations (automated) (#36494) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-16 10:29:07 +00:00
diondiondion
05244c335d Restructure appearance settings to introduce new Advanced settings section (#36496) 2025-10-16 09:44:24 +00:00
Claire
ef413ef713 Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream 2025-10-15 16:35:37 +02:00
Claire
fab0dd0bcf Change redirection for denied registration from web app to sign-in page with error message (#36384) 2025-10-15 11:37:22 +00:00
github-actions[bot]
339673d533 New Crowdin Translations (automated) (#36476) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-15 08:54:47 +00:00
Claire
302e3fe8be Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream 2025-10-14 18:01:40 +02:00
github-actions[bot]
484225895f New Crowdin Translations (automated) (#36457) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-14 12:26:21 +00:00
Jonathan de Jong
f2f711deeb Fix allow_referrer_origin typo (#36460) 2025-10-14 12:07:15 +00:00
Claire
8921494571 Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream 2025-10-13 14:26:11 +02:00
github-actions[bot]
8b78c033e8 New Crowdin Translations (automated) (#36433) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-13 09:25:52 +00:00
Claire
ee88f8550c Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream 2025-10-10 19:01:35 +02:00
github-actions[bot]
bcccfb19df New Crowdin Translations (automated) (#3224) 
* 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 18:52:05 +02:00
github-actions[bot]
3f2ee09827 New Crowdin Translations (automated) (#36420) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-10 09:06:57 +00:00
Emelia Smith
8898f120dc Improve display of content warnings in Admin UI (#35935) 2025-10-10 08:55:41 +00:00
Emelia Smith
81350c7cfb Add support for displaying link previews for Admin UI (#35958) 2025-10-10 08:43:48 +00:00
Claire
490c89a5a9 Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream 2025-10-09 17:59:13 +02:00
github-actions[bot]
a459ccf616 New Crowdin Translations (automated) (#36406) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-09 09:12:27 +00:00
Claire
f800057008 Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream 2025-10-08 18:07:04 +02:00
github-actions[bot]
3867f3bc61 New Crowdin Translations (automated) (#36386) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-08 10:06:30 +00:00
github-actions[bot]
adcbab527a New Crowdin Translations (automated) (#36371) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-07 12:37:46 +00:00
Claire
73a625c284 Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.
 2025-10-06 19:24:16 +02:00
github-actions[bot]
4dc21d7afd New Crowdin Translations (automated) (#36349) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-06 09:11:31 +00:00
Claire
2d2c525097 Split timeline_preview setting into more granular settings (#36338) 2025-10-06 08:34:05 +00:00
Claire
432af3c25d Merge commit '80c8a847409c73c4e9a086c8f398a984cf5c2137' into glitch-soc/merge-upstream 2025-10-04 14:22:26 +02:00
github-actions[bot]
4809b38f6e New Crowdin Translations (automated) (#36329) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-02 08:34:38 +00:00
Claire
17e0c745c6 Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream 2025-10-01 19:13:18 +02:00
Claire
5af40ff960 Fix some routes for numeric AP identifiers (#36304) 2025-09-30 15:09:59 +00:00
Claire
b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.
 2025-09-29 18:41:46 +02:00
Claire
150f0fcba5 Add support for numeric-based URIs for local accounts (#32724) 2025-09-29 12:05:48 +00:00
github-actions[bot]
4d8e848c6a New Crowdin Translations (automated) (#36276) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-29 09:16:16 +00:00
Claire
4053209a05 Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream 2025-09-25 18:44:23 +02:00
github-actions[bot]
d2bdb03da0 New Crowdin Translations (automated) (#36258) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-25 08:53:58 +00:00
Claire
b15b07606c Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream 2025-09-24 18:26:13 +02:00
github-actions[bot]
23a69e3bd7 New Crowdin Translations (automated) (#36246) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-24 09:18:50 +00:00
Claire
a548c5c29b Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream 2025-09-23 18:41:09 +02:00
David Roetzel
37cec638df Update to puma 7 (#36238) 2025-09-23 13:40:04 +00:00
github-actions[bot]
82f5901a3f New Crowdin Translations (automated) (#36228) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-23 09:56:46 +00:00