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
Emelia Smith
a7751d26e7
[Glitch] Disable rule selector in ReportReasonSelector if instance has no rules
...
Port 71f257d529
2024-08-19 18:34:06 +02:00
Claire
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
Claire
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation ( #31453 )
2024-08-19 14:41:32 +00:00
Emelia Smith
71f257d529
Disable rule selector in ReportReasonSelector if instance has no rules ( #31458 )
2024-08-19 12:28:06 +00:00
github-actions[bot]
c4e0a7dced
New Crowdin Translations (automated) ( #31463 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-19 08:29:48 +00:00
Renaud Chaput
ceeabffee5
[Glitch] Add a follow button & follower count on follow notifications
...
Port 32a78e56e0
2024-08-16 20:09:01 +02:00
Claire
3ea00508ac
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream
2024-08-16 20:06:59 +02:00
Renaud Chaput
32a78e56e0
Add a follow button & follower count on follow notifications ( #31433 )
2024-08-16 10:00:59 +00:00
github-actions[bot]
9a24552732
New Crowdin Translations (automated) ( #31440 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-16 09:11:33 +00:00
Michael Stanclift
104c378cb4
[Glitch] Modify profile directory page image borders
...
Port 9194197de5
2024-08-15 21:59:08 +02:00
Claire
9f2775830c
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream
2024-08-15 21:58:04 +02:00
Michael Stanclift
0dbdf6a7f3
[Glitch] Fix removal of border from account listing
...
Port a1ddaa9ee9
2024-08-14 21:28:16 +02:00
Renaud Chaput
524fc8563b
[Glitch] Fix notification screen crashing in rare cases where the status no longer exists
...
Port 0d85a79f19
2024-08-14 21:26:51 +02:00
Michael Stanclift
cf96857038
[Glitch] Fix collapsable column borders in Safari and improve Safari scrollbars
...
Port 7d4b602cb2
2024-08-14 21:25:45 +02:00
Claire
bf0129968e
[Glitch] Fix styling of notification browser permission denied banner
...
Port 12582d095e
2024-08-14 21:25:16 +02:00
Renaud Chaput
09929a42f7
[Glitch] Fix log out from user menu not working on Safari
...
Port c3e1d86d58
2024-08-14 21:24:50 +02:00
Michael Stanclift
9194197de5
Modify profile directory page image borders ( #31391 )
2024-08-14 19:23:45 +00:00
Claire
a190efcd6d
[Glitch] Fix modal border and padding inconsistencies
...
Port 2b1670da48
2024-08-14 21:23:10 +02:00
Renaud Chaput
072f560174
[Glitch] Change avatars border radius
...
Port f6d090fdf5
2024-08-14 21:22:42 +02:00
Renaud Chaput
d3db2d04ad
[Glitch] Add a border above the timeline hint for statuses with replies
...
Port 7e501c59c2
2024-08-14 21:22:07 +02:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
Michael Stanclift
a1ddaa9ee9
Fix removal of border from account listing ( #31432 )
2024-08-14 17:09:23 +00:00
github-actions[bot]
202f43ccc6
New Crowdin Translations (automated) ( #31411 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-14 07:04:01 +00:00
Renaud Chaput
0d85a79f19
Fix notification screen crashing in rare cases where the status no longer exists ( #31403 )
2024-08-14 06:47:15 +00:00
Michael Stanclift
7d4b602cb2
Fix collapsable column borders in Safari and improve Safari scrollbars ( #31389 )
2024-08-13 21:54:03 +00:00
Claire
12582d095e
Fix styling of notification browser permission denied banner ( #31406 )
2024-08-13 19:32:27 +00:00
Renaud Chaput
c3e1d86d58
Fix log out from user menu not working on Safari ( #31402 )
2024-08-13 17:49:23 +00:00
Claire
2b1670da48
Fix modal border and padding inconsistencies ( #31399 )
2024-08-13 17:48:28 +00:00
github-actions[bot]
862e793b45
New Crowdin Translations (automated) ( #31394 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-13 07:42:08 +00:00
Renaud Chaput
f6d090fdf5
Change avatars border radius ( #31390 )
2024-08-13 07:26:23 +00:00
Renaud Chaput
7e501c59c2
Add a border above the timeline hint for statuses with replies ( #31387 )
2024-08-13 07:14:41 +00:00
Claire
8426c20d34
[Glitch] Fix all streamed notification types being stored without filtering
...
Port a7b718c31a
2024-08-12 17:51:54 +02:00
Michael Stanclift
61b2139267
[Glitch] Fix account header avatar border
...
Port fbdda9f6c1
2024-08-12 17:51:25 +02:00
Michael Stanclift
47df10e9ed
[Glitch] Revert Safari scrollbar changes
...
Port 7365a13ee7
2024-08-12 17:50:25 +02:00
Essem
939af853e6
[Glitch] Fix extra slash on notification policy request
...
Port 2e03dc9fbf
2024-08-12 17:49:55 +02:00
Claire
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
Emelia Smith
b42661ba95
Add missing Appeals link under Moderation in navigiation ( #31071 )
2024-08-12 14:45:30 +00:00
