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
25,086 Commits 74 Branches 58 Tags
c3274513002c492522aec68cbad822b7e62e5c12
Commit Graph

25086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
David Roetzel
a5a2c6dc7e Add support for FASP data sharing (#34415) 2025-05-16 12:24:02 +00:00
Claire
3ea1f074ab Fix sidekiq JSON serialization warning in ActivityPub::FetchAllRepliesWorker (#34702) 2025-05-16 09:07:33 +00:00
github-actions[bot]
c058c45a8e New Crowdin Translations (automated) (#34701) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-16 08:07:14 +00:00
Claire
413fe9fe65 Merge pull request #3071 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6c743831aa
 2025-05-15 22:58:56 +02:00
Claire
24d3599690 Fix middle button mouse up on status header always opening status in a new tab (#34700) 2025-05-15 18:29:43 +00:00
diondiondion
34cf16263b [Glitch] fix: Hide "Followers you know" widget from your own profile, #34698 
Port 6c743831aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-15 19:10:05 +02:00
diondiondion
9ad3f4ffa8 [Glitch] fix: More "Followers you know" polish & bug fixes 
Port 3f965d83b0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-15 19:10:05 +02:00
diondiondion
ea9f451184 [Glitch] refactor: Remove duplicated AvatarGroup CSS and familiar followers cleanup 
Port ccffa11f2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-15 19:10:05 +02:00
Claire
0fda1f0e94 Merge commit '6c743831aab13a39f2020827f20933a51bc7cbc2' into glitch-soc/merge-upstream 2025-05-15 18:52:02 +02:00
diondiondion
6c743831aa fix: Hide "Followers you know" widget from your own profile, #34698 (#34699) 2025-05-15 14:40:01 +00:00
diondiondion
3f965d83b0 fix: More "Followers you know" polish & bug fixes (#34697) 2025-05-15 11:33:16 +00:00
Claire
ae281f31db Add dev:populate_sample_data rake task to populate test data (#34676) 2025-05-15 08:51:07 +00:00
github-actions[bot]
e17c78b679 New Crowdin Translations (automated) (#34695) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-15 08:50:48 +00:00
diondiondion
ccffa11f2b refactor: Remove duplicated AvatarGroup CSS and familiar followers cleanup (#34681) 2025-05-15 08:07:38 +00:00
renovate[bot]
d475bcce65 chore(deps): update dependency bootsnap to v1.18.5 (#34684) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-15 08:00:55 +00:00
Claire
8f8d000656 Merge pull request #3070 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1b68020331
 2025-05-14 23:11:31 +02:00
Claire
7cc3d85a72 Merge commit '1b68020331783c365cd5baa696945d0d8bc68f72' into glitch-soc/merge-upstream 2025-05-14 18:44:04 +02:00
Claire
1b68020331 Fix admin dashboard crash on specific Elasticsearch connection errors (#34683) 2025-05-14 14:50:32 +00:00
Claire
e8e93b82f1 Fix NoMethodError in ActivityPub::FetchAllRepliesWorker (#34682) 2025-05-14 13:43:34 +00:00
diondiondion
e0d4e24071 [Glitch] refactor: Prevent leading slashes in API urls 
Port c45ce549af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-14 14:05:22 +02:00
Echo
e5fa94886c [Glitch] Fix emoji bundle size 
Port 545e8fbd0c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-14 14:04:19 +02:00
diondiondion
63466c0c7a [Glitch] fix: Hide FamiliarFollowers widget when logged out 
Port 865a30ab0d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-14 14:00:00 +02:00
diondiondion
59f986784f [Glitch] feat: Add "Followers you know" widget to user profiles 
Port b135a831ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-14 13:59:41 +02:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Claire
aa04efb92a Move server rule creation form to its own page (#34637) 2025-05-14 09:43:07 +00:00
diondiondion
c45ce549af refactor: Prevent leading slashes in API urls (#34680) 2025-05-14 08:59:08 +00:00
github-actions[bot]
8d5b73d70d New Crowdin Translations (automated) (#34679) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-14 07:00:32 +00:00
renovate[bot]
16e36d8477 chore(deps): update dependency database_cleaner-active_record to v2.2.1 (#34674) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-14 06:57:27 +00:00
Echo
545e8fbd0c Fix emoji bundle size (#34677) 2025-05-14 06:39:05 +00:00
diondiondion
865a30ab0d fix: Hide FamiliarFollowers widget when logged out (#34678) 2025-05-13 17:55:16 +00:00
diondiondion
cc57fa4a41 docs: Improve local development readme (#34675) 2025-05-13 12:22:51 +00:00
Claire
5305e939c4 Add (currently unused) setting for default quote policy (#34623) 2025-05-13 11:47:38 +00:00
Claire
f993d7578b Use plural forms for date_of_birth prompt (#34636) 2025-05-13 11:29:22 +00:00
github-actions[bot]
65baf9b04a New Crowdin Translations (automated) (#34672) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-13 07:47:56 +00:00
renovate[bot]
050d76c010 fix(deps): update dependency pg to v8.16.0 (#34670) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-13 07:38:15 +00:00
diondiondion
b135a831ea feat: Add "Followers you know" widget to user profiles (#34652) 2025-05-13 06:38:18 +00:00
Marcel Hellkamp
c9a554bdca fix: OIDC account creation fails for long display names (#34639) 2025-05-12 15:51:53 +00:00
Claire
5ec840a32f Change REDIS_NAMESPACE deprecation warning to an error (#34664) 2025-05-12 15:14:15 +00:00
Jonny Saunders
b709ef8ac3 Add: Update root status when fetching replies (#34615) 2025-05-12 14:54:58 +00:00
Claire
4e2aa78a56 Fix tootctl accounts create failing because of date-of-birth check (#34663) 2025-05-12 09:28:12 +00:00
github-actions[bot]
3357ae9889 New Crowdin Translations (automated) (#34655) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-12 07:40:14 +00:00
renovate[bot]
6fa48fabb2 fix(deps): update dependency sass to v1.88.0 (#34659) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-12 07:20:48 +00:00
Renaud Chaput
9244ffc425 Fix eslint import plugin resolution in vscode (#34651) 2025-05-12 07:12:56 +00:00
Claire
dc3eb7ad5b Merge pull request #3069 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 82688387a8
 2025-05-09 23:37:06 +02:00
Claire
a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
Echo
0d22c4342b [Glitch] Fix bugs with upload progress 
Port 65c553ab59 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-05-09 18:16:03 +02:00
renovate[bot]
82688387a8 chore(deps): update dependency mime-types to '~> 3.7.0' (#34634) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-05-09 14:58:18 +00:00
renovate[bot]
23238ddd95 fix(deps): update dependency vite to v6.2.7 [security] (#34640) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-09 08:05:58 +00:00
Claire
912268295c Change /api/v2/instance to be enabled without authentication when limited federation mode is enabled (#34576) 2025-05-09 07:46:57 +00:00