tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
5476 Commits
Author SHA1 Message Date
github-actions[bot]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 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]andGitHub Actions 0f9f27972d New Crowdin Translations (automated) (#35165) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-25 08:05:57 +00:00
Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
Claire d8b0beb70d Merge commit 'b9b1500fc516ea31ab21441737c600f9b571a07d' into glitch-soc/merge-upstream 2025-06-24 21:44:33 +02:00
Claire 9fccf0a8c6 Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream 2025-06-24 20:45:46 +02:00
diondiondion 8ba1487f30 fix: Fix inaccessible "Clear search" button (#35152) 2025-06-24 14:36:05 +00:00
diondiondion 644da36336 feat: More obvious loading state when submitting a post (#35153) 2025-06-24 14:08:48 +00:00
Echo 8ee8231a43 Adds Redux and React-Intl to storybook (#35094) 2025-06-24 09:31:27 +00:00
Claire c4128d89c9 Fix Firefox not updating spellcheck language in textarea (#35148) 2025-06-24 09:08:00 +00:00
Claire 9954acf61d Fix “Alt text” button submitting form in moderation interface (#35147) 2025-06-24 09:04:26 +00:00
github-actions[bot]andGitHub Actions dba636da7a New Crowdin Translations (automated) (#35144) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-24 07:58:50 +00:00
diondiondion b9b1500fc5 fix: Update hashtags when (un)following a hashtag (#35101) 2025-06-23 11:44:59 +00:00
diondiondion d28a4428b5 refactor: Use new main menu as "Getting started" column in Advanced Web UI (#35117) 2025-06-23 09:59:47 +00:00
diondiondion 6166e61638 fix: Keep user on Compose page when changing screen size, #34937 (#35105) 2025-06-23 09:53:21 +00:00
github-actions[bot]andGitHub Actions e5aa8c1ff3 New Crowdin Translations (automated) (#35090) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-23 08:43:53 +00:00
Claire 9cb5a77c3e Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream 2025-06-21 22:59:04 +02:00
Claire ac039d5f13 Fix clicking a status multiple times causing duplicate entries in browser history (#35118) 2025-06-21 09:00:38 +00:00
Claire f8f458e5e6 Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream 2025-06-20 12:01:02 +02:00
diondiondion 08597a1819 fix: Prevent click on content warning banner in notification from opening the post (#35096) 2025-06-20 09:41:24 +00:00
Claire fc87ce7ca1 Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream 2025-06-17 18:56:38 +02:00
Claireanddiondiondion af157939d9 Fix sidebar rest position on mobile layout on RTL locales (#35067) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-06-17 14:41:51 +00:00
github-actions[bot]andGitHub Actions 1cb026f962 New Crowdin Translations (automated) (#35062) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-17 10:39:43 +00:00
Claire 0bb83dfe7d Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream 2025-06-16 21:07:55 +02:00
Claire 2c751a6a19 Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream 2025-06-16 20:08:52 +02:00
diondiondion 69f298731e fix: Fix glitchy iOS media attachment drag interactions (#35057) 2025-06-16 15:37:04 +00:00