Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,517 Commits 74 Branches 58 Tags
93bdb168170504e93f42d6b52bd2999ea17f48c2
Commit Graph

25517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f723718576 Merge pull request #3109 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b9b1500fc5
 2025-06-24 22:37:18 +02:00
diondiondion
f7c36f44a4 [Glitch] fix: Update hashtags when (un)following a hashtag 
Port b9b1500fc5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:21:05 +02:00
diondiondion
c6a99eaf5b [Glitch] refactor: Use new main menu as "Getting started" column in Advanced Web UI 
Port d28a4428b5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:21:05 +02:00
Claire
d8b0beb70d Merge commit 'b9b1500fc516ea31ab21441737c600f9b571a07d' into glitch-soc/merge-upstream 2025-06-24 21:44:33 +02:00
Claire
eb3823f0cf Merge pull request #3108 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6166e61638
 2025-06-24 21:41:28 +02:00
diondiondion
7fff0d24c8 [Glitch] fix: Keep user on Compose page when changing screen size, #34937 
Port 6166e61638 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 21:26:08 +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
diondiondion
fb5b8ae0a5 fix: Improve status focus indicators (#35150) 2025-06-24 09:34:43 +00:00
Matt Jankowski
fd902c04f7 Use config_for for omniauth enabled values (#35015) 2025-06-24 09:32:13 +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
renovate[bot]
0276354775 fix(deps): update dependency @vitejs/plugin-react to v4.6.0 (#35137) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-24 08:05:24 +00:00
github-actions[bot]
dba636da7a New Crowdin Translations (automated) (#35144) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-24 07:58:50 +00:00
renovate[bot]
43e9186e5d chore(deps): update dependency haml_lint to v0.63.0 (#35146) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-24 07:54:49 +00:00
Matt Jankowski
0338733531 Add model coverage and scopes to RuleTranslation class (#35098) 2025-06-24 07:44:50 +00:00
Eugen Rochko
1be48d0cab Change terms of service e-mail job to be iterable (#35126) 2025-06-24 07:41:39 +00:00
renovate[bot]
e60014ed9c fix(deps): update dependency pg to v8.16.2 (#35111) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-24 07:40:46 +00:00
Matt Jankowski
0d7f1584bc Move remaining _map method specs from account to mappings spec (#35142) 2025-06-24 07:40:24 +00:00
Matt Jankowski
36f01af6c4 Add Status#only_reblogs scope for annual report classes (#35141) 2025-06-24 06:54:55 +00:00
renovate[bot]
16057f550d fix(deps): update dependency pg-connection-string to v2.9.1 (#35112) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-24 06:51:37 +00:00
renovate[bot]
e79ecabd0a chore(deps): update dependency strong_migrations to v2.4.0 (#35140) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-24 06:51:09 +00:00
Matt Jankowski
c023ebc87a Limit count to pending&trending on admin/trends/tags page (#35120) 2025-06-23 13:30:12 +00:00
Matt Jankowski
ebc6897afb Extract method to DRY up month/year grouping in AnnualReport::TimeSeries class (#35113) 2025-06-23 12:18:29 +00:00
Matt Jankowski
b08ccaa5b3 Extract Account::Mappings concern from "interactions" (#35119) 2025-06-23 12:02:14 +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]
e5aa8c1ff3 New Crowdin Translations (automated) (#35090) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-23 08:43:53 +00:00
Matt Jankowski
8837fd8c54 Update rubocop to version 1.77.0 (#35128) 2025-06-23 07:40:11 +00:00
Claire
94c644983e Merge pull request #3107 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ac039d5f13
 2025-06-22 11:36:37 +02:00
Claire
13a07e44f1 [Glitch] Fix clicking a status multiple times causing duplicate entries in browser history 
Port ac039d5f13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-21 23:06:28 +02:00
diondiondion
f41981e772 [Glitch] fix: Fix SCSS lint warnings 
Port 3f743b1a07 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-21 23:04:16 +02: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
David Roetzel
adf812efb3 Fix missing terms of services link (#35115) 2025-06-21 08:59:47 +00:00
diondiondion
3f743b1a07 fix: Fix SCSS lint warnings (#35102) 2025-06-21 08:58:12 +00:00
Claire
2b360c479c Merge pull request #3106 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0ec6c26af3
 2025-06-20 13:52:06 +02:00
renovate[bot]
204ff46f7e chore(deps): update dependency rspec-rails to v8.0.1 (#35110) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-20 10:20:24 +00:00
Matt Jankowski
54f9a1b43b Extract secret size constants in Webhook model (#35104) 2025-06-20 10:05:24 +00:00
Matt Jankowski
e9b1c1edfe Simplify WebauthnCredential constant limit math (#35107) 2025-06-20 10:04:14 +00:00
diondiondion
455df074fe [Glitch] fix: Prevent click on content warning banner in notification from opening the post 
Port 08597a1819 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-20 12:03:17 +02:00
diondiondion
68fb65b08d [Glitch] fix: Prevent mobile navbar from overscrolling 
Port 102a7635d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-20 12:02:49 +02:00
diondiondion
c9d3b8e3a5 [Glitch] fix: Tweak focus style & spacing of list/hashtags expand/collapse button 
Port 474464ffff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-20 12:02:20 +02:00
Claire
f8f458e5e6 Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream 2025-06-20 12:01:02 +02:00
David Roetzel
0ec6c26af3 Fix error when RFC9421 signatures are used (#35109) 2025-06-20 09:44:26 +00: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