d815b3d100
Merge pull request #2818 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 9ba7c90151
2024-08-20 22:02:24 +02:00
bdc0e0d27e
[Glitch] Fix non-grouped notifications not loading on page load
...
Port 9ba7c90151
2024-08-20 19:42:36 +02:00
4c85fec993
[Glitch] Remove `font-awesome` npm package
...
Port 4c4bcad866
2024-08-20 18:49:56 +02:00
e19b3aaaba
[Glitch] Update CSS color variables to match our latest design system
...
Port 4016fd5128
2024-08-20 18:42:33 +02:00
eb9405bed9
[Glitch] Fix margin in follow notification in web UI
...
Port 05b4380051
2024-08-20 18:41:32 +02:00
57c38b9156
[Glitch] Harmonize persistent scrollbar styles
...
Port 2f01f5f4ea
2024-08-20 18:40:36 +02:00
4e5d85b637
[Glitch] Improve the list selection UI for notification requests
...
Port 98bf2fc27c
2024-08-20 18:39:48 +02:00
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
9ba7c90151
Fix non-grouped notifications not loading on page load ( #31514 )
2024-08-20 16:18:33 +00:00
f91403ccaa
Remove unused `fa_icon` helper method ( #31511 )
2024-08-20 15:59:59 +00:00
4c4bcad866
Remove `font-awesome` npm package ( #31512 )
2024-08-20 15:59:47 +00:00
4016fd5128
Update CSS color variables to match our latest design system ( #31510 )
2024-08-20 15:56:44 +00:00
6c26fb0ed6
Update dependency core-js to v3.38.1 ( #31507 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-20 14:36:14 +00:00
05b4380051
Fix margin in follow notification in web UI ( #31508 )
2024-08-20 14:03:09 +00:00
711e1fce0a
Fix pagination parameters in `GET /api/v2_alpha/notificatins` ( #31509 )
2024-08-20 13:54:08 +00:00
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
3be1b1eaae
Use material symbol for filters/statuses views ( #31371 )
2024-08-20 11:52:27 +00:00
71405eabfc
Use material symbols in table link helper ( #31359 )
2024-08-20 11:48:15 +00:00
c75f7262ed
New Crowdin Translations (automated) ( #31504 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-20 07:59:21 +00:00
2f01f5f4ea
Harmonize persistent scrollbar styles ( #31445 )
2024-08-20 07:48:51 +00:00
98bf2fc27c
Improve the list selection UI for notification requests ( #31457 )
2024-08-19 22:11:58 +00:00
a7a2ff6c1d
Use Dockerfile ADD to obtain ffmpeg and libvips source ( #31498 )
2024-08-19 19:44:28 +00:00
89a61954a7
Merge pull request #2817 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 53c183f899
2024-08-19 20:43:17 +02:00
bfd01110d8
[Glitch] Reload notifications when accepted notifications are merged (streaming only)
...
Port 53c183f899
2024-08-19 18:43:57 +02:00
99ffae7d44
[Glitch] Refactor some actions to be proper async actions instead of passing a continuation
...
Port 1e612c5a09
2024-08-19 18:43:24 +02:00
a7751d26e7
[Glitch] Disable rule selector in ReportReasonSelector if instance has no rules
...
Port 71f257d529
2024-08-19 18:34:06 +02:00
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations ( #31474 )
...
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
d2e4be0456
Hopefully fix notifications pagination flaky test ( #31494 )
2024-08-19 14:53:54 +00:00
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation ( #31453 )
2024-08-19 14:41:32 +00:00
40f6631ac9
Fix Husky git hooks not being installed anymore ( #31435 )
2024-08-19 13:55:18 +00:00
99051479c1
Fix Trending Tags pending review having an unstable sort order ( #31473 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 13:25:40 +00:00
71f257d529
Disable rule selector in ReportReasonSelector if instance has no rules ( #31458 )
2024-08-19 12:28:06 +00:00
31d374e5f5
Update opentelemetry-ruby (non-major) ( #31451 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 11:42:33 +00:00
3db3e3dae5
Update dependency postcss-preset-env to v10.0.2 ( #31488 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:56:08 +00:00
c4e0a7dced
New Crowdin Translations (automated) ( #31463 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-19 08:29:48 +00:00
9cda8c0197
Update dependency use-debounce to v10.0.3 ( #31468 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:12:01 +00:00
d57ee31413
Update devDependencies (non-major) ( #31489 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:10:15 +00:00
d6404714b6
Update eslint (non-major) ( #31490 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:10:13 +00:00
ec1ee7a732
Merge pull request #2815 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2d589a5ed4
2024-08-16 21:44:46 +02:00
ceeabffee5
[Glitch] Add a follow button & follower count on follow notifications
...
Port 32a78e56e0
2024-08-16 20:09:01 +02:00
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
2d589a5ed4
Fix incorrect activity matching in notification unfiltering worker ( #31456 )
2024-08-16 17:11:23 +00:00
1acbb628b9
Update changelog for v4.2.11 ( #31452 )
2024-08-16 12:52:57 +00:00
367d3841af
Update dependency aws-sdk-s3 to v1.158.0 ( #31447 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 10:34:40 +00:00
a2dfe5a779
Update dependency test-prof to v1.4.0 ( #31431 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 10:33:24 +00:00
32a78e56e0
Add a follow button & follower count on follow notifications ( #31433 )
2024-08-16 10:00:59 +00:00
622628a199
Update dependency rspec-rails to v6.1.4 ( #31442 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 10:00:15 +00:00
a0afbba54d
Update dependency sanitize to v6.1.3 ( #31434 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 09:54:27 +00:00
Claire
Matt Jankowski
Renaud Chaput
Eugen Rochko
Michael Stanclift
renovate[bot]
github-actions[bot]
Emelia Smith
Edward Moulsdale