tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,310 Commits 5 Branches 0 Tags
Commit Graph

4492 Commits

Author SHA1 Message Date
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Claire
520974e052
Add ability to filter quote posts in home timeline (#34946) 2025-06-05 15:36:51 +00:00
Echo
1fdcaaebbb
Add a way to easily unpin profiles from the featured account area (#34931) 2025-06-05 10:23:01 +00:00
Claire
375add0c83
Fix account note textarea being interactable before the relationship gets fetched (#34932) 2025-06-05 08:49:26 +00:00
github-actions[bot]
250c3b0c1f
New Crowdin Translations (automated) (#34939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-05 07:05:25 +00:00
diondiondion
6637ecb460
fix: Fix Safari volume bug, #34797 (#34929) 2025-06-04 14:35:29 +00:00
Claire
5d9e5967aa Merge commit 'f7c19226cff625895478b80302201c98f36163c8' into glitch-soc/merge-upstream 2025-06-04 11:01:40 +02:00
diondiondion
b64ad77e21
fix: Fix unauthenticated familiar followers request, #34911 (#34914) 2025-06-04 08:25:10 +00:00
Claire
23ce6d326c Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream removed OTel instrumentation around some code modified in glitch-soc
  because of the Markdown rendering feature.
  Removed the OTel instrumentation as upstream did.
 2025-06-03 18:34:37 +02:00
github-actions[bot]
efe8def0c6
New Crowdin Translations (automated) (#34897) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-03 07:57:07 +00:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Eugen Rochko
c77158c8b7
Fix nested buttons in search popout in web UI (#34871) 2025-06-02 12:21:31 +00:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
github-actions[bot]
eb42425427
New Crowdin Translations (automated) (#34874) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-02 08:24:52 +00:00
Claire
c2989e231d Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream 2025-05-31 15:30:19 +02:00
Eugen Rochko
44d71d59ef
Add icon to header of pinned posts carousel in web UI (#34869) 2025-05-30 22:24:34 +00:00
diondiondion
1cc853059f
refactor(Pinned posts carousel): Don't animate initial resize (#34868) 2025-05-30 18:06:41 +00:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
diondiondion
54ad57ea95
fix: Fix autoplay not working properly in AudioModal, #34841 (#34865) 2025-05-30 15:26:08 +00:00
Nicholas La Roux
0789ec93f8
Make account header profile pic exactly 2x post profile pic (#34807) 2025-05-30 12:33:30 +00:00
diondiondion
975db93e3f
feat: Add relationship info to hover card (#34792) 2025-05-30 12:32:19 +00:00
Claire
71a4a92dda
Fix featured posts and familiar followers showing up on hidden accounts (#34855) 2025-05-30 08:33:52 +00:00
github-actions[bot]
4130d9659c
New Crowdin Translations (automated) (#34847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-30 07:34:17 +00:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
Echo
6ffa262546
Update ESLint to not try to resolve virtual modules (#34837) 2025-05-28 10:04:52 +00:00
github-actions[bot]
43ccb04548
New Crowdin Translations (automated) (#34834) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-28 08:38:51 +00:00
Claire
086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
Echo
d78535eab9
Add language picker to server rules section (#34820) 2025-05-27 13:57:34 +00:00
github-actions[bot]
32b5da558e
New Crowdin Translations (automated) (#34817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-27 09:28:32 +00:00
Claire
e1cac17f4a Merge commit 'ba5320671c287b66284bc42544b3bccc506f22b9' into glitch-soc/merge-upstream 2025-05-26 20:47:12 +02:00
Echo
ba5320671c
Move pinned posts to a carousel (#34754) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-05-26 13:35:28 +00:00
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
github-actions[bot]
d1d3ff087a
New Crowdin Translations (automated) (#34795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-26 07:41:52 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
diondiondion
a13756148d
fix: Show hint for quotes hidden by filter (#34790) 2025-05-23 15:26:06 +00:00
Echo
84d03e4e16
Revert React Spring to 9.7.5 and updates Renovate (#34788) 2025-05-23 12:34:41 +00:00
diondiondion
68a5724b3e
fix: Allow quotes to be filtered (#34786) 2025-05-23 11:42:55 +00:00
github-actions[bot]
11c8177498
New Crowdin Translations (automated) (#34781) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-23 07:24:21 +00:00
nicole mikołajczyk
6b066eac2c
Fix “Open original page” and “Add or Remove from lists” being included in account dropdown even when irrelevant (#34767) 
Signed-off-by: Nicole Mikołajczyk <git@mkljczk.pl>
 2025-05-23 07:11:32 +00:00
diondiondion
5dda094daa
fix: Fix various UI text wrapping and overflow issues (#34774) 2025-05-23 07:07:05 +00:00
Claire
02ac18da51
Change display of quote posts to strip fallback link and preview cards (#34772) 2025-05-23 06:53:04 +00:00
Claire
e0ce4b9b6b
Fix quotes not being displayed in reblogs (#34773) 2025-05-22 15:23:45 +00:00
diondiondion
12c8a6498c
Add "Followers you know" to hovercard (#34769) 2025-05-22 12:46:14 +00:00
diondiondion
79ccba1758
Add visual indicator & link to nested quote posts (#34766) 2025-05-22 10:39:45 +00:00
github-actions[bot]
cddb69ed52
New Crowdin Translations (automated) (#34762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-22 10:11:03 +00:00
Claire
6ab96ba647
Use more generic locale as fallback for rules (#34756) 2025-05-21 16:22:54 +00:00
diondiondion
97b9e8849d
Add rendering of quote posts in web UI (#34738) 2025-05-21 15:50:45 +00:00