Noa Himesaka
acf40f349d
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-08-24 22:53:34 +09:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) ( #31559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-23 08:59:31 +00:00
Claire
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
Claire
e18bd0450a
Extract strings removed upstream
2024-08-22 22:17:33 +02:00
Claire
7ce079cd26
[Glitch] Fix missing CSS in moderation interface
...
Port e08d22724d
2024-08-22 22:11:48 +02:00
Claire
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
Claire
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
Claire
9f2d3c721c
[Glitch] Hide multiple selection bar for notification requests when no notificion requests are loaded
...
Port abe292b0ec
2024-08-22 20:00:19 +02:00
Emelia Smith
37f20514d3
[Glitch] Add button to view the Hashtag on the instance from Hashtags in Moderation UI
...
Port 376088f6da
2024-08-22 19:59:37 +02:00
Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
Claire
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded ( #31540 )
2024-08-22 13:42:02 +00:00
Emelia Smith
376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI ( #31533 )
2024-08-22 08:42:33 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) ( #31536 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-22 08:04:56 +00:00
Claire
1e814f58cc
[Glitch] Remove dead CSS code
...
Port 2da687a28b
2024-08-21 20:33:39 +02:00
Claire
fa2e758152
Merge commit '2da687a28b509025343d3d8ca17753de9b128e8f' into glitch-soc/merge-upstream
2024-08-21 20:32:02 +02:00
Claire
2da687a28b
Remove dead CSS code ( #31527 )
2024-08-21 17:05:02 +00:00
Claire
3ffdb7cdac
[Glitch] Remove fontawesome leftovers
...
Port edeae945c0
2024-08-21 18:52:40 +02:00
Claire
24849cdb1f
[Glitch] Add automatic notification polling for grouped notifications
...
Port d67e11733e
2024-08-21 18:51:27 +02:00
KMY（雪あすか）
a9cef5c324
[Glitch] Fix boost dialog visibility selection not being taken into account
...
Port 01a757d306
2024-08-21 18:50:44 +02:00
Claire
66bc8d5717
[Glitch] Fix distracting and confusing always-showing scrollbar track in boost confirmation modal
...
Port e48a64d3b5
2024-08-21 18:50:17 +02:00
mogaminsk
b2e6f11b81
[Glitch] Change translation strings of grouped notification label to have full context
...
Port 8c7642cd18
2024-08-21 18:49:54 +02:00
Eugen Rochko
bae0b81779
[Glitch] Change hints for missing remote content in web UI
...
Port b06c7b6b5a
2024-08-21 18:49:02 +02:00
Claire
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
Claire
edeae945c0
Remove fontawesome leftovers ( #31525 )
2024-08-21 15:55:35 +00:00
Claire
d67e11733e
Add automatic notification polling for grouped notifications ( #31513 )
2024-08-21 14:41:31 +00:00
KMY（雪あすか）
01a757d306
Fix boost dialog visibility selection not being taken into account ( #31523 )
2024-08-21 13:11:36 +00:00
Claire
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal ( #31524 )
2024-08-21 10:25:14 +00:00
mogaminsk
8c7642cd18
Change translation strings of grouped notification label to have full context ( #31486 )
2024-08-21 08:56:36 +00:00
github-actions[bot]
3994195fea
New Crowdin Translations (automated) ( #31521 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-21 07:19:16 +00:00
Eugen Rochko
b06c7b6b5a
Change hints for missing remote content in web UI ( #31516 )
2024-08-21 07:08:58 +00:00
Claire
bdc0e0d27e
[Glitch] Fix non-grouped notifications not loading on page load
...
Port 9ba7c90151
2024-08-20 19:42:36 +02:00
Matt Jankowski
4c85fec993
[Glitch] Remove font-awesome npm package
...
Port 4c4bcad866
2024-08-20 18:49:56 +02:00
Renaud Chaput
e19b3aaaba
[Glitch] Update CSS color variables to match our latest design system
...
Port 4016fd5128
2024-08-20 18:42:33 +02:00
Eugen Rochko
eb9405bed9
[Glitch] Fix margin in follow notification in web UI
...
Port 05b4380051
2024-08-20 18:41:32 +02:00
Michael Stanclift
57c38b9156
[Glitch] Harmonize persistent scrollbar styles
...
Port 2f01f5f4ea
2024-08-20 18:40:36 +02:00
Renaud Chaput
4e5d85b637
[Glitch] Improve the list selection UI for notification requests
...
Port 98bf2fc27c
2024-08-20 18:39:48 +02:00
Claire
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
Claire
9ba7c90151
Fix non-grouped notifications not loading on page load ( #31514 )
2024-08-20 16:18:33 +00:00
Matt Jankowski
4c4bcad866
Remove font-awesome npm package ( #31512 )
2024-08-20 15:59:47 +00:00
Renaud Chaput
4016fd5128
Update CSS color variables to match our latest design system ( #31510 )
2024-08-20 15:56:44 +00:00
Eugen Rochko
05b4380051
Fix margin in follow notification in web UI ( #31508 )
2024-08-20 14:03:09 +00:00
Matt Jankowski
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
Matt Jankowski
71405eabfc
Use material symbols in table link helper ( #31359 )
2024-08-20 11:48:15 +00:00
github-actions[bot]
c75f7262ed
New Crowdin Translations (automated) ( #31504 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-20 07:59:21 +00:00
Michael Stanclift
2f01f5f4ea
Harmonize persistent scrollbar styles ( #31445 )
2024-08-20 07:48:51 +00:00
Renaud Chaput
98bf2fc27c
Improve the list selection UI for notification requests ( #31457 )
2024-08-19 22:11:58 +00:00
Claire
bfd01110d8
[Glitch] Reload notifications when accepted notifications are merged (streaming only)
...
Port 53c183f899
2024-08-19 18:43:57 +02:00
Claire
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
