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

4599 Commits

Author SHA1 Message Date
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
Claire
5ff0039d7b Merge commit 'fab95b8dae3db411318638804a01675dd5b38a01' into glitch-soc/merge-upstream 2025-07-22 23:17:48 +02:00
github-actions[bot]
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]
6bb4113d0a
New Crowdin Translations (automated) (#35428) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-21 09:01:34 +00:00
github-actions[bot]
dbd0c3cbd9
New Crowdin Translations (automated) (#35420) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-18 07:52:05 +00:00
diondiondion
a842b14c84
refactor: Disable useDrag hook when main menu is not openable (#35414) 2025-07-17 12:39:40 +00:00
diondiondion
138746bdcc
fix: Add lang attribute to current composer language in alt text modal (#35412) 2025-07-17 11:12:54 +00:00
github-actions[bot]
7e2d92284c
New Crowdin Translations (automated) (#35408) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-17 09:31:22 +00:00
diondiondion
faffb73cbd
fix: Improve a11y of custom select menus in notifications settings (#35403) 2025-07-17 08:56:00 +00:00
Claire
d6ce7de2d3 Merge commit '331599fa2b335a7b832adcab594a833f09b808f0' into glitch-soc/merge-upstream 
Conflicts:
- `.github/ISSUE_TEMPLATE/1.web_bug_report.yml`:
  We don't use the github features that upstream does, so kept our version.
- `.github/ISSUE_TEMPLATE/2.server_bug_report.yml`:
  We don't use the github features that upstream does, so kept our version.
 2025-07-16 21:31:28 +02:00
github-actions[bot]
331599fa2b
New Crowdin Translations (automated) (#35399) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-16 12:24:09 +00:00
Claire
eeffe580d8 Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream 2025-07-15 18:19:32 +02:00
github-actions[bot]
d5e2cf5d3c
New Crowdin Translations (automated) (#35379) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-15 08:16:56 +00:00
diondiondion
82a6ff091f
fix: Improve Dropdown component accessibility (#35373) 2025-07-15 07:52:34 +00:00
Claire
ad38168b77 Merge commit '7273f6c03cfc7fb74cc29ca9df610d1efb16417d' into glitch-soc/merge-upstream 2025-07-14 20:50:55 +02:00
github-actions[bot]
a643d9d498
New Crowdin Translations (automated) (#35358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-14 06:21:56 +00:00
Claire
1716f8da71 Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a `features` attribute where glitch-soc had extra ones.
  Added `features` like upstream did.
 2025-07-11 18:53:47 +02:00
Echo
853a0c466e
Make bio hashtags open the local page instead of the remote instance (#35349) 2025-07-11 15:18:34 +00:00
Echo
94bceb8683
Expose enabled features to the frontend (#35348) 2025-07-11 13:15:22 +00:00
github-actions[bot]
b69b5ba775
New Crowdin Translations (automated) (#35344) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-11 08:14:39 +00:00
github-actions[bot]
b363a3651d
New Crowdin Translations (automated) (#35335) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-10 07:23:27 +00:00
Claire
e2a867507c Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream 2025-07-10 01:10:32 +02:00
Claire
e7c5c25de8
Fix replying from media modal or pop-in-player tagging user @undefined (#35317) 2025-07-09 12:13:51 +00:00
Echo
a1e8813522
Emoji Indexing and Search (#35253) 2025-07-09 09:55:41 +00:00
github-actions[bot]
76c1446416
New Crowdin Translations (automated) (#35310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-09 09:10:55 +00:00
Claire
3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
github-actions[bot]
71b2120e5c
New Crowdin Translations (automated) (#35286) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-08 09:22:38 +00:00
diondiondion
b5eebd4d2b
fix: Fix can't skip search field by tabbing (#35281) 2025-07-07 15:10:51 +00:00
github-actions[bot]
f6b2609353
New Crowdin Translations (automated) (#35269) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-07 08:21:51 +00:00
github-actions[bot]
83660ee381
New Crowdin Translations (automated) (#35261) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-04 07:34:54 +00:00
github-actions[bot]
c66c5fd73d
New Crowdin Translations (automated) (#35250) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-03 09:47:57 +00:00
github-actions[bot]
6f1135d763
New Crowdin Translations (automated) (#35238) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-02 09:17:03 +00:00
Echo
52bc2f64f4
Import Emojibase data (#35229) 2025-07-02 08:58:39 +00:00
Claire
98e90b7c1f Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream 2025-07-01 18:47:15 +02:00
github-actions[bot]
dd064aaa36
New Crowdin Translations (automated) (#35224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-01 09:02:26 +00:00
Claire
2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
github-actions[bot]
8782e860b6
New Crowdin Translations (automated) (#35208) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-30 09:33:15 +00:00
github-actions[bot]
6d017dbf10
New Crowdin Translations (automated) (#35202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-27 08:37:39 +00:00
Claire
f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.
 2025-06-26 18:04:37 +02:00
diondiondion
9576434d47
fix: Fix outdated icon in notifications permissions banner (#35193) 2025-06-26 13:25:12 +00:00
diondiondion
b804ed0cba
refactor: Tweak wording of "discard draft?" confirmation dialogs (#35192) 2025-06-26 13:03:24 +00:00
github-actions[bot]
a9f2ec45da
New Crowdin Translations (automated) (#35189) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-26 08:40:39 +00:00
diondiondion
c1ef1f62d5
fix: Prevent scrolling behind menus and modals in Safari iOS (#35183) 2025-06-25 19:22:11 +00:00
Claire
c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
 2025-06-25 19:29:09 +02:00
diondiondion
c6dddbb66e
fix: Prevent content scrolling behind main menu (part 1) (#35173) 2025-06-25 12:12:49 +00:00
Echo
c52848b444
Storybook Helpers (#35158) 2025-06-25 11:20:11 +00:00
github-actions[bot]
0f9f27972d
New Crowdin Translations (automated) (#35165) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-25 08:05:57 +00:00