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

4876 Commits

Author SHA1 Message Date
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]
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 Rochko
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]
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
Claire
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]
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
Echo
50dfab30c2
Emoji: Swap mode test to an emoji from 16.0 (#36530) 2025-10-20 13:04:38 +00:00
github-actions[bot]
82483ed8b0
New Crowdin Translations (automated) (#36520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-20 10:10:37 +00:00
Claire
22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
 2025-10-17 19:00:18 +02:00
Claire
4c0104084d Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream 2025-10-17 18:36:27 +02:00
Claire
515ce38a52 Merge commit '51d0bfcb385b49bfdd30b742d05e8e37257168d6' into glitch-soc/merge-upstream 2025-10-17 18:11:59 +02:00
Claire
811c1eaf7e
Fix relationship not being fetched to evaluate whether to show a quote post (#36517) 2025-10-17 13:03:18 +00:00
diondiondion
6dad80eb8c
Add new "quick boosting" setting (#36516) 2025-10-17 13:02:47 +00:00
github-actions[bot]
ccac6da3e8
New Crowdin Translations (automated) (#36513) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-17 08:41:07 +00:00
Claire
323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
Claire
f56fc1bab4 Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream 2025-10-16 18:36:25 +02:00
diondiondion
20961c7538
Add keyboard shortcut info banner to the boosting preferences section (#36506) 2025-10-16 14:53:23 +00:00
Echo
51d0bfcb38
Emoji: Update Twemoji to v16 (#36501) 2025-10-16 13:15:16 +00:00
Echo
7530f06dee
Emoji: Fix autoplay incorrectly being applied (#36503) 2025-10-16 12:46:17 +00:00
github-actions[bot]
5404f92cee
New Crowdin Translations (automated) (#36494) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-16 10:29:07 +00:00
Claire
ef53dcfd8c
Fix pinned hashtag columns fully refreshing unprompted (#36497) 2025-10-16 09:10:53 +00:00
diondiondion
869eeecfee
Show new replies early if the fetch-all-replies task takes long to finish (#36481) 2025-10-15 17:30:47 +00:00
Claire
ef413ef713 Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream 2025-10-15 16:35:37 +02:00
Emelia Smith
d8bdce2835
Fix rendering of poll options in status history modal (#35633) 2025-10-15 09:05:10 +00:00
github-actions[bot]
339673d533
New Crowdin Translations (automated) (#36476) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-15 08:54:47 +00:00
Claire
302e3fe8be Merge commit '50743cc35be19deae9356bd21f1143e3a9b4fbb8' into glitch-soc/merge-upstream 2025-10-14 18:01:40 +02:00
Claire
3232eee358
Fix error in logged-out hashtag view when remote posts require log-in (#36467) 2025-10-14 14:04:18 +00:00
github-actions[bot]
484225895f
New Crowdin Translations (automated) (#36457) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-14 12:26:21 +00:00
Claire
156f031ed0
Fix WebUI mistakenly allowing to attach quotes when editing (#36464) 2025-10-14 12:21:13 +00:00
Echo
0c64e7f75e
Emoji: Cleanup new code (#36402) 2025-10-14 09:36:25 +00:00
Claire
af82db5271 Merge commit 'edd7fd98722a0d49ea486aa790a186735e491f35' into glitch-soc/merge-upstream 2025-10-13 18:07:08 +02:00