fd73999a84
Merge pull request #2820 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2da687a28b
2024-08-21 22:41:10 +02:00
1e814f58cc
[Glitch] Remove dead CSS code
...
Port 2da687a28b
2024-08-21 20:33:39 +02:00
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
0cd60fdb82
Merge pull request #2819 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to edeae945c0
2024-08-21 20:31:08 +02:00
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
3ffdb7cdac
[Glitch] Remove fontawesome leftovers
...
Port edeae945c0
2024-08-21 18:52:40 +02:00
24849cdb1f
[Glitch] Add automatic notification polling for grouped notifications
...
Port d67e11733e
2024-08-21 18:51:27 +02:00
a9cef5c324
[Glitch] Fix boost dialog visibility selection not being taken into account
...
Port 01a757d306
2024-08-21 18:50:44 +02:00
66bc8d5717
[Glitch] Fix distracting and confusing always-showing scrollbar track in boost confirmation modal
...
Port e48a64d3b5
2024-08-21 18:50:17 +02:00
b2e6f11b81
[Glitch] Change translation strings of grouped notification label to have full context
...
Port 8c7642cd18
2024-08-21 18:49:54 +02:00
bae0b81779
[Glitch] Change hints for missing remote content in web UI
...
Port b06c7b6b5a
2024-08-21 18:49:02 +02:00
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
edeae945c0
Remove fontawesome leftovers ( #31525 )
2024-08-21 15:55:35 +00:00
19a1acb38b
Add `api_versions` to `/api/v2/instance` ( #31354 )
2024-08-21 14:54:59 +00:00
d67e11733e
Add automatic notification polling for grouped notifications ( #31513 )
2024-08-21 14:41:31 +00:00
01a757d306
Fix boost dialog visibility selection not being taken into account ( #31523 )
2024-08-21 13:11:36 +00:00
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal ( #31524 )
2024-08-21 10:25:14 +00:00
8c7642cd18
Change translation strings of grouped notification label to have full context ( #31486 )
2024-08-21 08:56:36 +00:00
b91264b1f3
Update dependency fugit ( #31522 )
2024-08-21 08:15:12 +00:00
3994195fea
New Crowdin Translations (automated) ( #31521 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-21 07:19:16 +00:00
b06c7b6b5a
Change hints for missing remote content in web UI ( #31516 )
2024-08-21 07:08:58 +00:00
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
Claire
KMY（雪あすか）
mogaminsk
Eugen Rochko
github-actions[bot]
Matt Jankowski
Renaud Chaput
Michael Stanclift
renovate[bot]
Emelia Smith
Edward Moulsdale