tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,915 Commits 5 Branches 0 Tags
e68de292b41fd8a9ad2e032c2079d8286992a2db
Commit Graph
4642 Commits
Author SHA1 Message Date
Claire e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
github-actions[bot]andGitHub Actions 39a3ffaf2f New Crowdin Translations (automated) (#35708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-07 08:46:11 +00:00
Claire 235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire 4838085d66 Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700) 2025-08-06 14:54:03 +00:00
Claire 55a98580aa Add UI for revoking quote posts (#35689) 2025-08-06 11:52:56 +00:00
github-actions[bot]andGitHub Actions 6f6e7d8d49 New Crowdin Translations (automated) (#35694) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-06 09:06:22 +00:00
Claire a4c05c694f Fix quote notification filtering and add settings (#35690) 2025-08-05 16:15:16 +00:00
Claire 3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
github-actions[bot]andGitHub Actions 54fd1c1f9b New Crowdin Translations (automated) (#35674) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 08:19:55 +00:00
Claire 53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire 081d38679f Add quote notifications to WebUI (#35653) 2025-08-04 18:12:37 +00:00
Echo 570c9d16be Performance regression fixes (#35664) 2025-08-04 17:16:12 +00:00
Echo 28b0e5ee78 Provides legacy fallback for browser that don't support regex flag v (#35659) 2025-08-04 17:15:46 +00:00
github-actions[bot]andGitHub Actions f68bd21600 New Crowdin Translations (automated) (#35634) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-04 09:20:50 +00:00
Claire 3caa318dfe Fix WebUI crashing for accounts with null URL (#35651) 2025-08-04 07:49:12 +00:00
Claire dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
github-actions[bot]andGitHub Actions d09f866daa New Crowdin Translations (automated) (#35622) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-01 07:57:38 +00:00
Echo 6bca52453a Emoji Rendering Efficiency (#35568) 2025-07-31 17:30:14 +00:00
Echo b81670776f Modern Emoji: Use local storage to opt-in (#35605) 2025-07-31 13:33:34 +00:00
github-actions[bot]andGitHub Actions 2131d1ff23 New Crowdin Translations (automated) (#35611) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-31 07:26:24 +00:00
Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Eugen Rochko b80e95b2aa Change new replies to be loaded automatically if thread previously empty (#35603) 2025-07-30 16:18:58 +00:00
Eugen Rochko 92bf55afd0 Change design of quote posts in web UI (#35584) 2025-07-30 15:53:42 +00:00
github-actions[bot]andGitHub Actions 1c89309db0 New Crowdin Translations (automated) (#35592) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-30 08:37:33 +00:00
Eugen Rochko d121007927 Change "new replies available" notice to be above replies in web UI (#35575) 2025-07-29 09:00:27 +00:00
github-actions[bot]andGitHub Actions d299b0d576 New Crowdin Translations (automated) (#35574) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-29 08:59:00 +00:00
Colin Dean b5cebf45ea Swap order of translation restoration and service credit on post card (#33619) 2025-07-28 11:33:11 +00:00
github-actions[bot]andGitHub Actions a57a9505d4 New Crowdin Translations (automated) (#35537) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-28 08:14:11 +00:00
william light f3786e0816 hotkeys: only match just() when no modifiers are held (#35535) 2025-07-26 05:51:50 +00:00
Claire 8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
github-actions[bot]andGitHub Actions d950298d29 New Crowdin Translations (automated) (#35514) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-25 07:29:48 +00:00
Claire 72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.
 2025-07-24 18:10:38 +02:00
Echo dfaca794bf Force modern emoji experimental to be dev mode only (#35505) 2025-07-24 14:55:00 +00:00
diondiondion 6fc77a545b fix: Fix TypeError on pages with empty feeds (#35504) 2025-07-24 14:30:56 +00:00
Mayank 8baed8b90e remove redundant title text from media modal images in web UI (#35468) 2025-07-24 08:58:22 +00:00
github-actions[bot]andGitHub Actions 469304359a New Crowdin Translations (automated) (#35495) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-24 07:49:09 +00:00
Echo 7f9ad7eabf Enables cross-origin Web Workers (#35483) 2025-07-24 07:14:27 +00:00
Claire a6794c066d Fix “Expand this post” link including user @undefined (#35478) 2025-07-23 23:09:24 +00:00
Claire 63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Echo 7d3ef27a8d Fix accidentally instantiating Web Worker (#35473) 2025-07-23 14:01:45 +00:00
Eugen Rochko 14a781fa24 Add button to load new replies in web UI (#35210) 2025-07-23 13:42:07 +00:00
Claire 45d79427c4 Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Conflict because of differently-named theme plugins.
  Updated to go with upstream's changes.
 2025-07-23 12:08:59 +02:00
diondiondion d36236cbcd fix: Fix glitchy status keyboard navigation (#35455) 2025-07-23 07:39:36 +00:00
Claire 5ff0039d7b Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream 2025-07-22 23:17:48 +02:00
Echo 760d00b7f7 Emoji Rendering (#35424) 2025-07-22 14:43:15 +00:00
github-actions[bot]andGitHub Actions be3dc5b508 New Crowdin Translations (automated) (#35453) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-22 10:10:37 +00:00
Claire 4bc361546e Merge commit '19626ad89f66a32a3ddecb4f43a7b84e3236d287' into glitch-soc/merge-upstream 2025-07-21 21:19:53 +02:00
diondiondion ee21f72211 fix: Don't submit post when pressing Enter in CW field (#35445) 2025-07-21 15:57:20 +00:00
diondiondion 4de5cbd6f5 refactor: Replace react-hotkeys with custom hook (#35425) 2025-07-21 14:43:38 +00:00
github-actions[bot]andGitHub Actions 6bb4113d0a New Crowdin Translations (automated) (#35428) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-21 09:01:34 +00:00