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,571 Commits 74 Branches 58 Tags
24089589b792d0488accb3c5962f0e993f42c7d6
Commit Graph

4504 Commits

Author SHA1 Message Date
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
github-actions[bot]
a42258eca2 New Crowdin Translations (automated) (#36198) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-22 07:59:19 +00:00
Claire
880e662a60 Merge commit '854aaec6fe69df02e6d850cb90eef37032b4d72f' into glitch-soc/merge-upstream 2025-09-19 18:18:56 +02:00
github-actions[bot]
e45fd85436 New Crowdin Translations (automated) (#3171) 
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-09-19 10:52:27 +02:00
github-actions[bot]
23efdf12cb New Crowdin Translations (automated) (#36187) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-19 07:58:45 +00:00
Claire
af360df59b Merge commit '48005c55fffd1540105ca53870da64f742a0f7fc' into glitch-soc/merge-upstream 2025-09-18 19:19:36 +02:00
github-actions[bot]
bb3f9ed13b New Crowdin Translations (automated) (#36160) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-18 08:17:25 +00:00
Claire
210786efd8 Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream 2025-09-17 18:17:18 +02:00
github-actions[bot]
ff03938808 New Crowdin Translations (automated) (#36143) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-17 07:27:03 +00:00
Claire
26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.
 2025-09-16 18:30:30 +02:00
github-actions[bot]
96d0f6f049 New Crowdin Translations (automated) (#36133) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-16 09:43:02 +00:00
Claire
cc52833296 Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream 2025-09-15 18:39:09 +02:00
github-actions[bot]
93c977eb3d New Crowdin Translations (automated) (#36105) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-15 08:28:25 +00:00
Claire
5da295fa4d Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream 2025-09-13 11:12:22 +02:00
Eugen Rochko
30b31a89e6 Add schema.org markup to SEO-enabled posts (#36075) 2025-09-12 09:12:07 +00:00
github-actions[bot]
b59e06fba7 New Crowdin Translations (automated) (#36092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-09-12 09:04:44 +00:00