tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,806 Commits 5 Branches 0 Tags
a116d11bc6ac1bfbbd0222a01656dc3e4f941916
Commit Graph
4901 Commits
Author SHA1 Message Date
Claire a7ba4ba446 Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream 2025-11-04 20:38:24 +01:00
Claire 26e7fe9771 Change paste-link-to-quote loading state from generic loading bar to compose placeholder (#36695) 2025-11-04 19:20:39 +00:00
Claire 1b795c12e9 Change quote action to error instead of insert link in Private Mentions (#36721) 2025-11-04 17:58:50 +00:00
Echo 3ab5ae1e4a Quote Posts: Add notifications for DMs and private posts (#36696) 2025-11-04 16:32:52 +00:00
Echo 90d4b3b943 Refactor: Media Modal (#36673) 2025-11-04 13:58:35 +00:00
Claire 3a54d56fbd Fix quote dropdown menu item in detailed status view (#36704) 2025-11-04 11:01:25 +00:00
Claire b5c550ff0b Remove option to disable access to local topic feeds for logged-in users (#36703) 2025-11-04 10:37:43 +00:00
Jeong Arm b999a626e5 Reverse 'Hide/Show all' eye icon for thread view (#22301) 2025-11-04 10:35:50 +00:00
github-actions[bot]andGitHub Actions e5fbb49033 New Crowdin Translations (automated) (#36697) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-04 08:10:20 +00:00
Claire 8d1208224f Merge commit 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream 2025-11-03 21:04:45 +01:00
Claire bae5877c84 Disable paste-link-to-quote flow when composing Private Mentions (#36690) 2025-11-03 13:56:07 +00:00
github-actions[bot]andGitHub Actions 61c0daffc9 New Crowdin Translations (automated) (#36676) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-03 12:21:04 +00:00
Claire 6ff4dad89d Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream 2025-10-31 18:03:21 +01:00
diondiondion 055f581ca5 Fix initially selected language in Rules panel, hide selector when no alternative translations exist (#36672) 2025-10-31 14:20:59 +00:00
github-actions[bot]andGitHub Actions d47ca1cc36 New Crowdin Translations (automated) (#36660) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-31 10:24:16 +00:00
diondiondion 499ddfe8e1 Add separate translation key for "About this server" string (#36664) 2025-10-31 10:07:10 +00:00
diondiondion fcecbf31ed Show error when submitting empty post rather than failing silently (#36650) 2025-10-30 19:29:25 +00:00
Echo 28cb345131 Fix: Ensure carousel focuses on wrapper (#36649) 2025-10-30 13:08:24 +00:00
github-actions[bot]andGitHub Actions a77038b288 New Crowdin Translations (automated) (#36641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-30 07:52:39 +00:00
Echoanddiondiondion e7cd5a430e Refactor carousel components (#36425) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-29 14:44:46 +00:00
Claire 1b60f597d7 Merge commit '2a9c7d2b9e51cdfbc636972c0f9ffdbe06c02d59' into glitch-soc/merge-upstream 2025-10-29 13:42:26 +01:00
Claire 2a9c7d2b9e Fix quote-inline fallback being removed even for legacy quotes (#36638) 2025-10-29 11:56:34 +00:00
Claire 002e592667 Merge commit '51877081b435b38e1c5bd449087279469fa7c667' into glitch-soc/merge-upstream 2025-10-29 12:24:49 +01:00
github-actions[bot]andGitHub Actions 7b66eefd3e New Crowdin Translations (automated) (#36632) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-29 10:13:42 +00:00
Claire e437bb919f Change display of blocked and muted quoted users (#36619) 2025-10-29 09:13:12 +00:00
Claire 48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.
 2025-10-28 22:10:12 +01:00
Claire 5f3f75559f Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream 2025-10-28 20:25:09 +01:00
Claire 4896d2c4c6 Change firehose labels depending on which feeds are accessible (#36607) 2025-10-28 16:59:37 +00:00
diondiondion e1bd9b944a chore(deps): update dependency eslint-plugin-jsdoc to v60 (#36466) 2025-10-28 15:17:33 +00:00
Claire b01d21c4d4 Hashtag fixes (#36625) 2025-10-28 14:26:08 +00:00
Claire 3ccb6632f2 Fix mention matching ignoring path (#36626) 2025-10-28 14:05:39 +00:00
Echo 9c7d09993d Fix props in DisplayName component (#36622) 2025-10-28 14:02:37 +00:00
Echo 85d0cdb5f7 Emoji: Remove final flag (#36409) 2025-10-28 11:33:27 +00:00
github-actions[bot]andGitHub Actions 5d00ae7eb3 New Crowdin Translations (automated) (#36617) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-28 08:29:36 +00:00
Claire 3bf99b8a4a Fix URL comparison for mentions in case of empty path (#36613) 2025-10-27 18:19:52 +00:00
Echo d0d09fd3a5 Emoji: Fix Web Worker import (#36603) 2025-10-27 17:36:01 +00:00
Eugen RochkoandClaire 76053fb4a9 Fix hashtags not being picked up when full-width hash sign is used (#36103) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-27 17:18:01 +00:00
David Roetzel 402686c76c Remove http_message_signatures feature flag (#36610) 2025-10-27 16:06:44 +00:00
Renaud Chaput 779a1f8448 Add a new setting to choose the server landing page (#36588) 2025-10-27 10:16:59 +00:00
github-actions[bot]andGitHub Actions e40ca321ed New Crowdin Translations (automated) (#36590) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-27 09:45:37 +00:00
Claire deed31ba8c Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
 2025-10-23 18:33:52 +02:00
diondiondion 1ba579b0a1 Fix "new post highlighting" in threads being applied when navigating between posts (#36583) 2025-10-23 15:52:07 +00:00
Claireanddiondiondion 2fa5dd6d1f Add UI support for disabled live feeds (#36577) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2025-10-23 09:59:43 +00:00
Claire ee9a15031b Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream 2025-10-22 18:06:32 +02:00
Claire 9f7075a0ce Remove unnecessary restrictions on HTML handling (#36548) 2025-10-22 13:55:41 +00:00
diondiondion 7ea2af6ae2 Refresh thread replies periodically & when refocusing window (#36547) 2025-10-22 09:43:03 +00:00
github-actions[bot]andGitHub Actions 08ae77fd9c New Crowdin Translations (automated) (#36556) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-22 08:24:40 +00:00
Claire 9080083263 Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream 2025-10-20 21:37:50 +02:00
Echo 6e2973aa2d Emoji: Fix unneeded re-renders when StatusContent changes (#36532) 2025-10-20 14:52:27 +00:00
Claire 97c8cc5606 Fix position of quote dropdown menu item when “quick boosting” is enabled (#36528) 2025-10-20 13:05:40 +00:00