Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,540 Commits 74 Branches 58 Tags
c9a1e27a4973bf3ec7866f53bf9eb8f36ca86bd7
Commit Graph

25540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Claire
dbb20f76a7 Fix crash in development environment with no prebuilt assets and no vite dev server running (#35177) 2025-06-25 14:20:07 +00:00
renovate[bot]
91741214e1 chore(deps): update node.js to 22.17 (#35166) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-25 14:01:46 +00:00
diondiondion
8fa32ca8ba fix: Fix search icon overlapping text on Trending page (#35175) 2025-06-25 13:26:44 +00:00
Matt Jankowski
8285194451 Move layout setup for OAuth views to controllers (#35176) 2025-06-25 13:26:17 +00:00
Claire
392eaf1010 Ensure consistent ordering of rule translations in admin interface (#35174) 2025-06-25 13:15:59 +00:00
Claire
fa9318083e Merge pull request #3110 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8ba1487f30
 2025-06-25 14:51:27 +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
Claire
0a7418e6d8 Change rule translation interface to display english name and populate empty translations (#35170) 2025-06-25 10:02:19 +00:00
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
github-actions[bot]
0f9f27972d New Crowdin Translations (automated) (#35165) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-25 08:05:57 +00:00
Matt Jankowski
9f16f41678 Remove patch for unsupported redis version (#35155) 2025-06-25 07:53:38 +00:00
Matt Jankowski
47fda2df2c Update OAuth inflection to match spec (#35160) 2025-06-25 07:52:30 +00:00
Matt Jankowski
377289c961 Add coverage for doorkeeper model extensions (#35161) 2025-06-25 07:50:20 +00:00
Matt Jankowski
f852da50f6 Add User#email_domain method to extract domain from email address (#35159) 2025-06-25 07:22:19 +00:00
diondiondion
e44143db8c [Glitch] fix: Fix inaccessible "Clear search" button 
Port 8ba1487f30 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 23:10:50 +02:00
diondiondion
73f77edf40 [Glitch] feat: More obvious loading state when submitting a post 
Port 644da36336 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:54:00 +02:00
diondiondion
eb1674ec50 [Glitch] feat: Add Storybook for component documentation, testing, and development 
Port f2cfa4f482 to glitch-soc

Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:53:02 +02:00
diondiondion
c9f17899a6 [Glitch] fix: Improve status focus indicators 
Port fb5b8ae0a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:50:00 +02:00
Echo
97d3dac4b6 [Glitch] Adds Redux and React-Intl to storybook 
Port 8ee8231a43 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:49:40 +02:00
Claire
e44b333660 [Glitch] Fix Firefox not updating spellcheck language in textarea 
Port c4128d89c9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:48:35 +02:00
Claire
26ee915d0b [Glitch] Fix “Alt text” button submitting form in moderation interface 
Port 9954acf61d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-24 22:48:07 +02: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
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