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

4445 Commits

Author SHA1 Message Date
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
Claire
8c51a8ba94
Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
github-actions[bot]
07741f307e
New Crowdin Translations (automated) (#34750) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-21 08:28:04 +00:00
Claire
ef87cd6910
Fix incorrect progress value being passed to react-spring in video player (#34740) 2025-05-20 13:12:08 +00:00
github-actions[bot]
8ed0408adb
New Crowdin Translations (automated) (#34736) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-20 08:13:20 +00:00
renovate[bot]
feb4e0a007
fix(deps): update dependency @react-spring/web to v10 (#34693) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-05-19 12:35:10 +00:00
diondiondion
24551375cf
fix: Show Follow account modal before allowing adding to list, #34468 (#34709) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-19 09:54:45 +00:00
github-actions[bot]
e291f95a04
New Crowdin Translations (automated) (#34713) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-19 07:35:35 +00:00
Claire
c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
Echo
c4f47adb49
Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +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
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
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
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
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
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
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
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
diondiondion
b135a831ea
feat: Add "Followers you know" widget to user profiles (#34652) 2025-05-13 06:38:18 +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
Claire
a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
github-actions[bot]
7cd7445abe
New Crowdin Translations (automated) (#34649) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-09 07:07:17 +00:00
Claire
5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream 
Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`
 2025-05-08 15:47:40 +02:00
Claire
d600aa4694 Merge commit '741f166407a79b666475aae662339c127f182e24' into glitch-soc/merge-upstream 2025-05-08 15:31:15 +02:00
Echo
8c579c5b34
Migrate from Jest to Vitest (#34454) 2025-05-07 18:29:02 +00:00
github-actions[bot]
741f166407
New Crowdin Translations (automated) (#34633) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-07 08:45:03 +00:00
Claire
49e9a1fe4e Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream 
Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
 2025-05-06 16:30:33 +02:00
Claire
3bbf3e9709
Fix code style issue (#34624) 2025-05-06 13:35:54 +00:00
Claire
79931bf3ae
Merge commit from fork 
* Check scheme in account and post links

* Harden media attachments

* Client-side mitigation

* Client-side mitigation for media attachments
 2025-05-06 15:02:13 +02:00
Claire
8d98d91f33 Merge commit '22e2e7f02b2f25f30abd6a616bc3b0b543b30279' into glitch-soc/merge-upstream 2025-05-06 12:06:51 +02:00
Renaud Chaput
df6b808750
fix: do not use the deprecated /api/v1/instance end point (#34613) 2025-05-06 06:08:44 +00:00
Claire
d14d7a5379 Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream 2025-05-05 20:31:48 +02:00
github-actions[bot]
eacf6f2342
New Crowdin Translations (automated) (#34596) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-05 08:23:27 +00:00
Claire
68bb158c84 Merge commit '8b34daf2541c6afdb5ade19e4531373ef7b05bc0' into glitch-soc/merge-upstream 2025-05-03 18:28:25 +02:00
Claire
ff07676aee Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream 2025-05-03 18:03:42 +02:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Eugen Rochko
b4394ec129
Change design of audio player in web UI (#34520) 2025-05-02 16:15:00 +00:00
github-actions[bot]
94fa5b7168
New Crowdin Translations (automated) (#34587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-02 06:59:30 +00:00
Patryk Rzucidło
e3f0b955b8
Fix directory scroll position reset (#34560) 2025-04-30 12:27:37 +00:00
github-actions[bot]
64ab9be93f
New Crowdin Translations (automated) (#34580) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-04-30 07:31:08 +00:00
Eugen Rochko
79013c730d
Add endorsed accounts to profiles in web UI (#34568) 2025-04-29 12:14:22 +00:00
Claire
b81c28e7dc
Fix edit dropdown crashing the web interface on mobile (#34564) 2025-04-29 09:48:54 +00:00
Claire
98e6dfcbcf
Fix context selector trying to mutate immutable state (#34573) 2025-04-29 08:12:05 +00:00