Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
renovate[bot]
0d650780e2
fix(deps): update dependency postcss-preset-env to v10.2.4 ( #35194 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-06-26 14:17:31 +00:00
Eugen Rochko
1804a87193
Change terms of service generator to not be displayed ( #35127 )
2025-06-26 13:26:41 +00:00
diondiondion
9576434d47
fix: Fix outdated icon in notifications permissions banner ( #35193 )
2025-06-26 13:25:12 +00:00
diondiondion
b804ed0cba
refactor: Tweak wording of "discard draft?" confirmation dialogs ( #35192 )
2025-06-26 13:03:24 +00:00
David Roetzel
48451b782d
Move email env var reading to yml files ( #35191 )
2025-06-26 12:18:30 +00:00
Claire
2e0a00ab46
Fix search operators sometimes getting lost ( #35190 )
2025-06-26 10:35:49 +00:00
Claire
e4618a6ba5
Merge pull request #3111 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to dbb20f76a7
2025-06-26 12:01:09 +02:00
github-actions[bot]
a9f2ec45da
New Crowdin Translations (automated) ( #35189 )
...
Co-authored-by: GitHub Actions <noreply@github.com >
2025-06-26 08:40:39 +00:00
diondiondion
c1ef1f62d5
fix: Prevent scrolling behind menus and modals in Safari iOS ( #35183 )
2025-06-25 19:22:11 +00:00
diondiondion
d285b07774
[Glitch] fix: Fix search icon overlapping text on Trending page
...
Port 8fa32ca8baclaire.github-309c@sitedethib.com >
2025-06-25 19:46:43 +02:00
diondiondion
0156ed6641
[Glitch] fix: Prevent content scrolling behind main menu (part 1)
...
Port c6dddbb66eclaire.github-309c@sitedethib.com >
2025-06-25 19:46:18 +02:00
Echo
9e5b9433f8
[Glitch] Storybook Helpers
...
Port c52848b444claire.github-309c@sitedethib.com >
2025-06-25 19:44:38 +02:00
Emelia Smith
34b8ff8267
[Glitch] Implement Instance Moderation Notes
...
Port CSS changes from 72f2f35bfbclaire.github-309c@sitedethib.com >
2025-06-25 19:42:23 +02:00
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 8ba1487f30claire.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 644da36336claire.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 f2cfa4f482ChaosExAnima@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 fb5b8ae0a5claire.github-309c@sitedethib.com >
2025-06-24 22:50:00 +02:00
Echo
97d3dac4b6
[Glitch] Adds Redux and React-Intl to storybook
...
Port 8ee8231a43claire.github-309c@sitedethib.com >
2025-06-24 22:49:40 +02:00
Claire
e44b333660
[Glitch] Fix Firefox not updating spellcheck language in textarea
...
Port c4128d89c9claire.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 9954acf61dclaire.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 b9b1500fc5claire.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 d28a4428b5claire.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 6166e61638claire.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
