2b0410f903
Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-18 17:19:57 +02:00
044dd3f788
Fix column-settings spacing in local timeline in advanced view ( #32567 )
2024-10-18 15:49:26 +02:00
e507b4f884
Add ability to group follow notifications in WebUI ( #32520 )
2024-10-18 09:14:13 +02:00
198283a188
Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while
glitch-soc has a different version of the file overall.
Added upstream's changes.
2024-10-16 12:42:12 +02:00
b01bd74698
Add back a 6 hours mute duration option ( #32522 )
2024-10-16 12:40:58 +02:00
b091e531a5
Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3
2024-10-15 17:42:22 +02:00
49b3d5692e
Fix reblog icons on account media view ( #32506 )
2024-10-15 17:37:14 +02:00
70472de726
Fix follow recommendation carrousel scrolling on RTL layouts, for real ( #32505 )
2024-10-15 17:37:14 +02:00
a2e24ee2de
Fix follow recommendation carrousel scrolling on RTL layouts ( #32462 )
2024-10-15 11:57:59 +02:00
b40adb4a89
Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3
2024-10-14 19:18:08 +02:00
f75eb1a8b0
Fix “Mention” appearing for otherwise filtered posts ( #32356 )
2024-10-14 13:14:38 +02:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
11a12e56b3
Change media reordering design in the compose form in web UI ( #32093 )
2024-09-27 15:09:39 +00:00
a04433f995
Add ability to view alt text by clicking the ALT badge in web UI ( #32058 )
2024-09-26 13:26:49 +00:00
7a62d57427
Add fallback to domain block confirmation modal ( #32105 )
2024-09-26 12:47:56 +00:00
89df27a06c
Change design of media tab on profiles in web UI ( #31967 )
2024-09-26 12:31:32 +00:00
3426ea2912
Add preview of followers removed in domain block modal in web UI ( #32032 )
2024-09-25 18:13:36 +00:00
28c4eca0af
Change responsive break points on navigation panel in web UI ( #32034 )
2024-09-25 16:36:19 +00:00
633165ba9c
Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream
2024-09-25 17:41:37 +02:00
3dc4ddc663
Fix search params being dropped when redirected to non-deck path ( #31984 )
2024-09-25 13:35:37 +00:00
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
0a6b75b71e
Fix multiple bugs in notification requests and notification policies ( #32062 )
2024-09-24 15:03:38 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
b5bdc69f7b
Change mobile breakpoint back to old version and allow main column to shrink ( #32033 )
2024-09-23 12:53:35 +00:00
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
e7fd0985c9
Change zoom icon in web UI ( #29683 )
2024-09-20 09:42:02 +00:00
ae03e4ffc6
Update directory page options to use URL params ( #31977 )
2024-09-19 15:34:08 +00:00
ef4d6ab988
Fix browser glitch caused by two overlapping scroll animations in web UI ( #31960 )
2024-09-19 10:52:46 +00:00
6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow ( #31889 )
2024-09-17 03:19:42 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
6c76a7a907
Fix cancel follow request button sometimes saying “Follow back” ( #31934 )
2024-09-16 13:20:44 +00:00
c620452fd7
Enable grouped notifications unconditionally ( #31929 )
2024-09-16 13:12:10 +00:00
c0eda832f3
Convert notification requests actions and reducers to Typescript ( #31866 )
2024-09-16 09:54:03 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
caaa412e6e
Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream
2024-09-12 17:34:16 +02:00
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
5f782f9629
Autofocus primary button in modals ( #31883 )
2024-09-12 13:15:05 +00:00
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
f2a92c2d22
Fix notifications re-rendering spuriously in web UI ( #31879 )
2024-09-12 08:16:07 +00:00
a27f7f4e56
Update typescript-eslint monorepo to v8 (major) ( #31231 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-09-11 13:59:46 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
ec4c49082e
Change design of unread conversations in web UI ( #31763 )
2024-09-05 09:39:59 +00:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
585e369e0b
Fix display name being displayed instead of domain in remote reports ( #31613 )
2024-09-04 13:43:08 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
8adf67f2db
`frequentlyUsedLanguages` not updated correctly ( #31386 )
2024-09-03 15:55:13 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
Claire