dd2a991e24
Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
079d681ac6
Fix uninitialized grouped notifications read marker on initial load ( #31347 )
2024-08-08 17:00:05 +00:00
0e4d3c0403
New Crowdin Translations (automated) ( #31337 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-08 13:54:10 +00:00
2edae5ea28
Convert PrivacyDropdownMenu to Typescript and generalize it to DropdownSelector component ( #31338 )
2024-08-08 10:57:21 +00:00
a95fe931d7
Really fix duplicate border around search results ( #31305 )
2024-08-08 09:22:48 +00:00
176ba984d4
Follow up tweaking of admin UI changes part 2 ( #31268 )
2024-08-08 09:21:54 +00:00
ac9040b76b
Add explainer for filtered notifications from limited accounts ( #31331 )
2024-08-08 09:16:33 +00:00
f8629367d2
Add unchangeable filtered notification setting for limited accounts ( #31324 )
2024-08-07 23:09:30 +00:00
84c3cc4e5b
Replace more `font-awesome` icons in `views/admin` area ( #30961 )
2024-08-07 23:08:36 +00:00
52a626f39b
Replace more `font-awesome` icons in `app/helpers` ( #30962 )
2024-08-07 22:53:15 +00:00
e4092cc73a
Replace more `font-awesome` icons in `views/settings` ( #30963 )
2024-08-07 22:52:35 +00:00
abc4ed48f2
Replace more `font-awesome` icons in navigation sidebar area ( #30974 )
2024-08-07 22:52:08 +00:00
e4e1173beb
Merge pull request #2807 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 670e4655d1
2024-08-07 22:42:41 +02:00
56b280186f
[Glitch] Change group notifications unread markers to only be cleared when focusing/navigating again
...
Port 6f285bb2a6
2024-08-07 19:24:14 +02:00
06e034db15
Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream
2024-08-07 19:22:25 +02:00
670e4655d1
Change dismissing a notification to clear existing filtered notifications for that account ( #31329 )
2024-08-07 15:14:37 +00:00
6f285bb2a6
Change group notifications unread markers to only be cleared when focusing/navigating again ( #31325 )
2024-08-07 11:12:42 +00:00
af2aec1a82
Change notification requests to only count mentions ( #31322 )
2024-08-07 11:12:36 +00:00
fc964c9bfd
New Crowdin Translations (automated) ( #31321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-07 09:32:16 +00:00
719cabe024
Fix logic of block/mute bypass for mentions from moderators ( #31271 )
2024-08-07 06:52:10 +00:00
241d76075c
Merge pull request #2806 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to c8b9e60ec1
2024-08-07 08:48:46 +02:00
43546659bf
[Glitch] Fix mutes and blocks not immediately cleaning up notification requests in Web UI
...
Port c8b9e60ec1
2024-08-06 17:42:24 +02:00
1c91b363d5
[Glitch] Fix broken “mute” button in mutes list
...
Port 30430a62e2
2024-08-06 17:37:49 +02:00
7bb171a9ea
[Glitch] Remove usage of non-public RTK types
...
Port 57a1f86626
2024-08-06 17:37:26 +02:00
f0f2ce2855
[Glitch] fix(deps): update dependency @reduxjs/toolkit to v2.2.7 - abandoned
...
Port 103e544cfa
2024-08-06 17:36:54 +02:00
01b4c996b2
[Glitch] Add account notes to hover cards
...
Port 97b9e8befd
2024-08-06 17:35:51 +02:00
ad786cb7af
[Glitch] Improve look of verified header fields in profile
...
Port c01a6a6eeb
2024-08-06 17:34:36 +02:00
316132bdbd
[Glitch] Fix duplicate border around search results
...
Port 315308b10c
2024-08-06 17:34:08 +02:00
c5b7f48cce
[Glitch] Fix missing border around tab/filter bar
...
Port b6c1b8f748
2024-08-06 17:33:35 +02:00
5cdc0c2b43
[Glitch] Disable irrelevant fields unless cleanup is enabled
...
Port 3d6e8d6834
2024-08-06 17:32:53 +02:00
700ebdb5e2
[Glitch] Fix typo in english message (filtred => filtered)
...
Port 19f4aa1147
2024-08-06 17:31:53 +02:00
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
c8b9e60ec1
Fix mutes and blocks not immediately cleaning up notification requests in Web UI ( #31316 )
2024-08-06 13:35:15 +00:00
30430a62e2
Fix broken “mute” button in mutes list ( #31315 )
2024-08-06 13:34:55 +00:00
57a1f86626
Remove usage of non-public RTK types ( #31312 )
2024-08-06 12:22:18 +00:00
438dac99d6
Add option to request partial accounts in grouped notifications API ( #31299 )
2024-08-06 12:09:35 +00:00
5d890ebc57
Delete pending notification requests on block and notification mutes ( #31310 )
2024-08-06 10:07:16 +00:00
9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter ( #31285 )
2024-08-06 08:23:48 +00:00
103e544cfa
fix(deps): update dependency @reduxjs/toolkit to v2.2.7 - abandoned ( #31173 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-08-06 07:54:00 +00:00
e9e63ed203
Support JSON-LD named graph ( #31288 )
2024-08-06 07:52:47 +00:00
135493c0b4
chore(deps): update dependency rubocop-rspec to v3.0.4 ( #31301 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-06 07:47:03 +00:00
d15f46a0b8
New Crowdin Translations (automated) ( #31307 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-06 07:22:38 +00:00
97b9e8befd
Add account notes to hover cards ( #31300 )
2024-08-06 06:53:59 +00:00
c01a6a6eeb
Improve look of verified header fields in profile ( #31275 )
2024-08-05 11:35:16 +00:00
656373817e
chore(deps): update dependency bootsnap to v1.18.4 ( #31297 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-05 11:30:35 +00:00
cb56a6dc7e
New Crowdin Translations (automated) ( #31276 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-05 07:43:04 +00:00
a1eaf12d63
chore(deps): update dependency fog-core to '<= 2.5.0' ( #31267 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-05 07:14:05 +00:00
02c2222879
fix(deps): update dependency postcss-preset-env to v10 ( #31279 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-05 07:13:47 +00:00
29d6310b80
chore(deps): update dependency sidekiq-scheduler to v5.0.6 ( #31245 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-05 07:13:14 +00:00
9e440bee19
chore(deps): update dependency aws-sdk-s3 to v1.157.0 ( #31252 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-05 07:13:00 +00:00
Claire
github-actions[bot]
Valtteri Laitinen
Michael Stanclift
Matt Jankowski
Renaud Chaput
renovate[bot]
Christian Schmidt