tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,876 Commits 5 Branches 0 Tags
fb7dda40ea3e25989c493c4763f7f052080573e2
Commit Graph
4868 Commits
Author SHA1 Message Date
Claire 44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
github-actions[bot]andGitHub Actions c6facd27ed New Crowdin Translations (automated) (#38871) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 16:44:20 +00:00
github-actions[bot]andGitHub Actions 20e3265f3b New Crowdin Translations (automated) (#38864) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 12:32:25 +00:00
Claire 1df259f8c9 Fix translation string of some fallback notifications (#38860) 2026-04-30 09:18:32 +00:00
github-actions[bot]andGitHub Actions deb72a4c91 New Crowdin Translations (automated) (#38859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-30 08:21:13 +00:00
Claire 5b395774c0 Add fallback attributes to notifications for new and infrequent notifications (#38832) 2026-04-29 15:53:29 +00:00
David Roetzel 725d8983fa Fix client-side collection routes (#38850) 2026-04-29 14:52:32 +00:00
github-actions[bot]andGitHub Actions 578836f9ae New Crowdin Translations (automated) (#38842) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-29 13:47:29 +00:00
github-actions[bot]andGitHub Actions 4f76bdfcb7 New Crowdin Translations (automated) (#38824) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-28 11:39:12 +00:00
David Roetzel 1f1653e039 Remove rejected and revoked collection items (#38792) 2026-04-28 11:10:25 +00:00
Claire 57017329a4 Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream 2026-04-27 20:18:51 +02:00
github-actions[bot]andGitHub Actions c53bb2fcd6 New Crowdin Translations (automated) (#38805) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-27 08:09:16 +00:00
Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
github-actions[bot]andGitHub Actions a4e5c3244f New Crowdin Translations (automated) (#38800) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-24 08:46:34 +00:00
diondiondion a217b633b7 Allow defining alt text for server thumbnail (#38796) 2026-04-23 17:46:50 +00:00
Claire be4ba1495c Remove unused devise strategies (#38795) 2026-04-23 14:26:19 +00:00
github-actions[bot]andGitHub Actions a8741495c4 New Crowdin Translations (automated) (#38790) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-23 08:42:05 +00:00
David Roetzel fdb2563abf Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +00:00
Claire b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
David Roetzel 1cae543e8f Add per-user maximum number of collections (#38769) 2026-04-22 12:34:08 +00:00
github-actions[bot]andGitHub Actions a3127a146d New Crowdin Translations (automated) (#38774) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-22 10:42:55 +00:00
Claire 0b3c848958 Merge commit 'a706fce6781104b3aa1315be14f1fb8ccd4fcb1b' into glitch-soc/merge-upstream 2026-04-21 19:20:05 +02:00
github-actions[bot]andGitHub Actions 9717dc64d0 New Crowdin Translations (automated) (#38762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-21 11:10:06 +00:00
Claire e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.
 2026-04-20 18:51:00 +02:00
github-actions[bot]andGitHub Actions d9149bfed9 New Crowdin Translations (automated) (#38743) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-20 07:47:02 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt JankowskiandClaire 475e6833ff Update to copy and order for media display options (#38731) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 13:31:14 +00:00
github-actions[bot]andGitHub Actions 18c79e4e45 New Crowdin Translations (automated) (#38705) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-16 09:32:46 +00:00
Claire ff80786d2e Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream 2026-04-15 13:36:46 +02:00
github-actions[bot]andGitHub Actions 05c9ebf2ce New Crowdin Translations (automated) (#38683) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-15 09:25:46 +00:00
github-actions[bot] 91cb6aa410 Merge pull request #3469 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2026-04-14 19:40:03 +02:00
Claire 817291c692 Merge commit '2b93d19d2ca18366b015e3dcde412e67625fe8f5' into glitch-soc/merge-upstream 2026-04-14 18:19:27 +02:00
github-actions[bot]andGitHub Actions 4fcab304e3 New Crowdin Translations (automated) (#38665) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-14 10:12:20 +00:00
Claire 63a244fe1a Add /api/v1_alpha/accounts/:id/in_collections to list collections you are in (#38657) 2026-04-13 17:28:28 +00:00
Claire 9177a3e807 Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream 2026-04-13 19:12:08 +02:00
github-actions[bot]andGitHub Actions f4f1a86da6 New Crowdin Translations (automated) (#38647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-13 08:57:02 +00:00
Matt Jankowski bb64905b21 Update redis gem to version 5.4.1 (#38110) 2026-04-13 07:44:06 +00:00
Claire 1eac058989 Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream 2026-04-11 13:22:19 +02:00
github-actions[bot]andGitHub Actions 9c164aa16c New Crowdin Translations (automated) (#38635) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-10 11:18:59 +00:00
diondiondion eed704d4bd Update wording for discoverable option (#38633) 2026-04-09 15:32:20 +00:00
diondiondion d6c0b93c85 Change "My collections" path to /@username/collections (#38630) 2026-04-09 15:31:49 +00:00
github-actions[bot]andGitHub Actions 875cd30150 New Crowdin Translations (automated) (#38620) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-09 10:50:03 +00:00
Claire b9014ec220 Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main 2026-04-08 19:32:32 +02:00
github-actions[bot]andGitHub Actions de86ad56e5 New Crowdin Translations (automated) (#38597) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-08 08:37:51 +00:00
Claire 69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Echo e4e7e679b3 Profile editing: Removes old profile editing page (#38584) 2026-04-07 13:52:04 +00:00
Matt Jankowski 71e6e50846 Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
github-actions[bot]andGitHub Actions 0a64bcae63 New Crowdin Translations (automated) (#38564) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-07 09:34:30 +00:00
Claire da85a16692 Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream 2026-04-04 09:31:50 +02:00
Matt JankowskiandBrendan Jones 621628e2cf Clarify that language filter does not impact home/lists (#38490) 
Co-authored-by: Brendan Jones <16049594+brendanjones@users.noreply.github.com>
 2026-04-03 14:46:29 +00:00