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

9642 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
3bd56b92c1
Reimplement misleading link tagging in new HTML handling code (#3254) 2025-10-28 21:59:53 +01:00
Claire
70b8281730
Reimplement mention rewriting in new HTML handling code (#3247) 2025-10-28 21:22:36 +01:00
Renaud Chaput
5a051d07c6 [Glitch] Add a new setting to choose the server landing page 
Port 779a1f84481ae9b73247083aa1573cc4e9e04cca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-28 20:26:40 +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
26ec19a649
Change styling of column banners (#36531) 2025-10-28 14:45:46 +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
diondiondion
422fa1cf9f
Revert "Fix custom emoji width (#27969)" (#36620) 2025-10-28 12:36:22 +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
marousta
dc851c9efc
Fix custom emoji width (#27969) 2025-10-27 15:56:06 +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
diondiondion
305f1e5757 [Glitch] Fix "new post highlighting" in threads being applied when navigating between posts 
Port 1ba579b0a181fbfff514ef32b50179d2ab1fc342 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-23 18:45:53 +02:00
Claire
b11bd2bdbb [Glitch] Add UI support for disabled live feeds 
Port 2fa5dd6d1ff60e9f5250c96d10ed3f1dddca7e3f to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-23 18:45:27 +02: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
ee87afd6a4 [Glitch] Remove unnecessary restrictions on HTML handling 
Port 9f7075a0ce2b6ecef8d92ef318785fa8ce708688 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-22 18:08:21 +02:00
diondiondion
2d8b7a7fd8 [Glitch] Fix text overflow alignment for long author names in News 
Port 7538bc77b787c861a062e2c4cc849e39b98a3a63 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-22 18:08:00 +02:00
diondiondion
cbc07af929 [Glitch] Refresh thread replies periodically & when refocusing window 
Port 7ea2af6ae227875c0dc66f1810fa33ae8567860f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-22 18:07:34 +02: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
7538bc77b7
Fix text overflow alignment for long author names in News (#36562) 2025-10-22 13:08:51 +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
Echo
8b3ff4f8b1 [Glitch] Emoji: Fix unneeded re-renders when StatusContent changes 
Port 6e2973aa2d3dc9466f2cc9b352e0eb2b260bf463 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:40:05 +02:00
Claire
af1b658c20 [Glitch] Fix position of quote dropdown menu item when “quick boosting” is enabled 
Port 97c8cc560675070a5c82c1f253e41229fb5d2493 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:38:56 +02:00
Echo
7b44fd6d3c [Glitch] Emoji: Swap mode test to an emoji from 16.0 
Port 50dfab30c27a8557105fe6c0e99f4c1737dff363 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-20 21:38:37 +02: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
5123f8aa94 [Glitch] Fix relationship not being fetched to evaluate whether to show a quote post 
Port 811c1eaf7e8978d93f24669e55b173052c01fb9f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 19:08:59 +02:00
diondiondion
460222e8e1 [Glitch] Add new "quick boosting" setting 
Port 6dad80eb8c9030af59c57f0369b078efee3e3a82 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 19:08:20 +02: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
diondiondion
e1b109f074 [Glitch] Add keyboard shortcut info banner to the boosting preferences section 
Port 20961c75383dcb1d60068ebf923868388d8661a7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:39:19 +02:00
Echo
d81bdb96e0 [Glitch] Emoji: Fix emoji picker not centering native emoji 
Port 63dc426fae9410a346e944773cf86a33c0600c13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:38:43 +02:00
Emelia Smith
2b2de5cdb1 [Glitch] Implement quote posts in Moderator UI 
Port 210b3896439c3ec741be477bfc4054ef3705a76e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:38:19 +02:00
Claire
4c0104084d Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream 2025-10-17 18:36:27 +02:00
Echo
90ab9fe13c [Glitch] Emoji: Update Twemoji to v16 
Port 51d0bfcb385b49bfdd30b742d05e8e37257168d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-10-17 18:13:18 +02:00