]> Untitled Git - lemmy-ui.git/log
lemmy-ui.git
13 months agoMerge branch 'main' into issue-template-checkboxes
Raymond Berger [Wed, 14 Jun 2023 21:03:39 +0000 (23:03 +0200)]
Merge branch 'main' into issue-template-checkboxes

13 months agoMerge pull request #1264 from alectrocute/AA/create-community-infinite-loading-bug
SleeplessOne1917 [Wed, 14 Jun 2023 15:50:31 +0000 (15:50 +0000)]
Merge pull request #1264 from alectrocute/AA/create-community-infinite-loading-bug

13 months agoupdate prop name
Alec Armbruster [Wed, 14 Jun 2023 13:39:19 +0000 (09:39 -0400)]
update prop name

13 months agohandle loading state on community-form.tsx
Alec Armbruster [Wed, 14 Jun 2023 13:32:25 +0000 (09:32 -0400)]
handle loading state on community-form.tsx

13 months agoUse http client (#1081)
SleeplessOne1917 [Wed, 14 Jun 2023 12:20:40 +0000 (12:20 +0000)]
Use http client (#1081)

* Beginning work on websocket -> http client conversion.

* About 30% done.

* half done.

* more done.

* Almost passing lint.

* Passing lint, but untested.

* Add back in event listeners.

* Fixing some community forms.

* Remove webpack cache.

* fixing some more.

* Fixed ISOwrappers.

* A few more fixes.

* Refactor utils

* Fix instance add/remove buttons

* Not catching errors in isoWrapper.

* Wrap Http client

* Fixing up tagline and ratelimit forms.

* Make all http client wrapping be in one place

* Reworking some more forms.

* Upgrading lemmy-js-client.

* Fixing verify email.

* Fix linting errors

* Upgrading woodpecker node.

* Fix comment scrolling rerender bug.

* Fixing a few things, commenting out props for now.

* v0.18.0-beta.1

* Trying to fix woodpecker, 1.

* Trying to fix woodpecker, 2.

* Handroll prompt

* Add navigation prompt to other pages

* Fix prompt navigation bug

* Fix prompt bug introduced from last bug fix

* Fix PWA bug

* Fix isoData not working

* Fix search page update url

* Fix sharp issue.

* v0.18.0-beta.2

* Make create post pre-fetch communities

* Fix bug from last commit

* Fix issue of posts/comments not being switched when changing select options

* Fix unnecessary fetches on home screen

* Make circular icon buttons not look stupid

* Prevent unnecessary fetches

* Make login experience smoother

* Add PWA shortcuts

* Add related application to PWA

* Update translations

* Forgot to add post editing.

* Fixing site setup.

* Deploy script setup.

* v0.18.0-beta.4

* Sanitize again.

* Adding sanitize json function.

* Upping version.

* Another sanitize fix.

* Upping version.

* Prevent search nav item from disappearing when on search page

* Allow admin and mod actions on non-local comments.

* Fix mobile menu collapse bug

* Completely fix prompt component

* Fix undefined value checks in use_http_client_2 (#1230)

* fix: filter out undefined from posts

* fix: emoji initialisation passing undefined

* fix: || => ?? to be more explicit

* linting

---------

Co-authored-by: Alex Maras <alexmaras@gmail.com>
* Re-add accidentally removed state

* Fix dropdown bug

* Use linkEvent where appropriate

* Fix navigation warnings.

---------

Co-authored-by: Dessalines <tyhou13@gmx.com>
Co-authored-by: Alex Maras <dev@alexmaras.com>
Co-authored-by: Alex Maras <alexmaras@gmail.com>
13 months agoadd instance url
RayBB [Wed, 14 Jun 2023 10:06:26 +0000 (12:06 +0200)]
add instance url

13 months agono comma
RayBB [Wed, 14 Jun 2023 09:41:56 +0000 (11:41 +0200)]
no comma

13 months agoreorder questions
RayBB [Wed, 14 Jun 2023 09:39:18 +0000 (11:39 +0200)]
reorder questions

13 months agoimprove q for feature request
Raymond Berger [Wed, 14 Jun 2023 09:25:49 +0000 (11:25 +0200)]
improve q for feature request

13 months agomake question clearer
Raymond Berger [Wed, 14 Jun 2023 09:24:17 +0000 (11:24 +0200)]
make question clearer

13 months agoUpdate BUG_REPORT.yml
Raymond Berger [Wed, 14 Jun 2023 09:18:43 +0000 (11:18 +0200)]
Update BUG_REPORT.yml

13 months agoprettier
RayBB [Wed, 14 Jun 2023 08:31:11 +0000 (10:31 +0200)]
prettier

13 months agoadd checkboxes to feature requests
RayBB [Wed, 14 Jun 2023 08:22:46 +0000 (10:22 +0200)]
add checkboxes to feature requests

13 months agorequired under label
RayBB [Wed, 14 Jun 2023 08:19:04 +0000 (10:19 +0200)]
required under label

13 months agoindent validations
RayBB [Wed, 14 Jun 2023 08:16:45 +0000 (10:16 +0200)]
indent validations

13 months agolabel array
RayBB [Wed, 14 Jun 2023 08:15:24 +0000 (10:15 +0200)]
label array

13 months agoadd checkboxes to issue template
RayBB [Wed, 14 Jun 2023 08:12:32 +0000 (10:12 +0200)]
add checkboxes to issue template

13 months agoMerge pull request #1237 from Zetaphor/patch-1
SleeplessOne1917 [Tue, 13 Jun 2023 22:42:59 +0000 (22:42 +0000)]
Merge pull request #1237 from Zetaphor/patch-1

13 months agoAdd title to pictrs-image
Zetaphor [Tue, 13 Jun 2023 17:24:15 +0000 (12:24 -0500)]
Add title to pictrs-image

This adds a title tag to images, uses the alt tag value. This improves accessibility for sighted users and screen readers.

13 months agoMake the community title in the sidebar link to the local community. (#1161)
cmp [Tue, 13 Jun 2023 10:34:21 +0000 (05:34 -0500)]
Make the community title in the sidebar link to the local community. (#1161)

* Make the community title in the sidebar link to the local community.

* Ternary erudaStr for PR.

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
13 months agoFix prompt component (#1223)
SleeplessOne1917 [Tue, 13 Jun 2023 10:33:27 +0000 (10:33 +0000)]
Fix prompt component (#1223)

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
13 months agoFix mobile menu collapse bug (#1222)
SleeplessOne1917 [Tue, 13 Jun 2023 02:24:24 +0000 (02:24 +0000)]
Fix mobile menu collapse bug (#1222)

13 months agoMerge pull request #1195 from fheft/fix-button-click-area
SleeplessOne1917 [Mon, 12 Jun 2023 23:11:20 +0000 (23:11 +0000)]
Merge pull request #1195 from fheft/fix-button-click-area

Fix unclickable button paddings

13 months agoMerge branch 'main' into fix-button-click-area
SleeplessOne1917 [Mon, 12 Jun 2023 23:02:28 +0000 (23:02 +0000)]
Merge branch 'main' into fix-button-click-area

13 months agoMerge pull request #1210 from alectrocute/avatar-aspect-ratio-fix
SleeplessOne1917 [Mon, 12 Jun 2023 21:15:18 +0000 (21:15 +0000)]
Merge pull request #1210 from alectrocute/avatar-aspect-ratio-fix

Fix avatar/icon aspect ratio

13 months agoMerge branch 'main' into avatar-aspect-ratio-fix
SleeplessOne1917 [Mon, 12 Jun 2023 21:12:49 +0000 (21:12 +0000)]
Merge branch 'main' into avatar-aspect-ratio-fix

13 months agoAnother try at sanitize. (#1208)
Dessalines [Mon, 12 Jun 2023 20:17:57 +0000 (16:17 -0400)]
Another try at sanitize. (#1208)

* Sanitize again.

* Adding sanitize json function.

* Using serialize instead.

13 months agoremove unused theme files (#1202)
Raymond Berger [Mon, 12 Jun 2023 18:57:52 +0000 (20:57 +0200)]
remove unused theme files (#1202)

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
13 months agoissue templates in yml format (#1211)
Raymond Berger [Mon, 12 Jun 2023 18:49:53 +0000 (20:49 +0200)]
issue templates in yml format (#1211)

* add BUG_REPORT.yml

* remove .md file

* fix keys

* cleanup description

* add question.yml

* add hexbear.yml

* remove title

* feature request yml

13 months agoMake preview button say "edit" when in preview mode (#1164)
SleeplessOne1917 [Mon, 12 Jun 2023 18:14:03 +0000 (18:14 +0000)]
Make preview button say "edit" when in preview mode (#1164)

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
13 months agoAdd shortcut for submitting post (#1163)
SleeplessOne1917 [Mon, 12 Jun 2023 18:13:33 +0000 (18:13 +0000)]
Add shortcut for submitting post (#1163)

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
13 months agoMerge branch 'main' into avatar-aspect-ratio-fix
Alec Armbruster [Mon, 12 Jun 2023 17:10:25 +0000 (13:10 -0400)]
Merge branch 'main' into avatar-aspect-ratio-fix

13 months agoformat with prettier
Alec Armbruster [Mon, 12 Jun 2023 17:09:50 +0000 (13:09 -0400)]
format with prettier

13 months agoadd .img-cover class, implement
Alec Armbruster [Mon, 12 Jun 2023 17:00:18 +0000 (13:00 -0400)]
add .img-cover class, implement

13 months agoMerge branch 'main' into fix-button-click-area
SleeplessOne1917 [Mon, 12 Jun 2023 14:33:28 +0000 (14:33 +0000)]
Merge branch 'main' into fix-button-click-area

13 months agoFix typo in post-listing.tsx (#1181)
Ikko Eltociear Ashimine [Mon, 12 Jun 2023 14:05:36 +0000 (23:05 +0900)]
Fix typo in post-listing.tsx (#1181)

recieve -> receive

13 months agoFixed unclickable button paddings
Florian Heft [Mon, 12 Jun 2023 08:30:37 +0000 (10:30 +0200)]
Fixed unclickable button paddings

* Remove the wrapping <button> element that
  visually seems clickable but has no click
  handling (only its child link can be
  clicked)
* fixes #1193

13 months agoMerge pull request #1176 from MageJohn/main
SleeplessOne1917 [Mon, 12 Jun 2023 08:50:16 +0000 (08:50 +0000)]
Merge pull request #1176 from MageJohn/main

13 months agoSet html lang attr to the interface language
Yuri Pieters [Sun, 11 Jun 2023 15:21:41 +0000 (16:21 +0100)]
Set html lang attr to the interface language

13 months agoMerge pull request #1185 from MageJohn/run-prettier
SleeplessOne1917 [Sun, 11 Jun 2023 23:24:43 +0000 (23:24 +0000)]
Merge pull request #1185 from MageJohn/run-prettier

13 months agoRun prettier
Yuri Pieters [Sun, 11 Jun 2023 21:47:57 +0000 (22:47 +0100)]
Run prettier

13 months agoMerge pull request #1173 from alectrocute/collapse-expand-align-comment
SleeplessOne1917 [Sun, 11 Jun 2023 14:16:38 +0000 (14:16 +0000)]
Merge pull request #1173 from alectrocute/collapse-expand-align-comment

Left-align comment collapse/expand button

13 months agoMerge branch 'collapse-expand-align-comment' of https://github.com/alectrocute/lemmy...
Alec Armbruster [Sun, 11 Jun 2023 14:06:27 +0000 (10:06 -0400)]
Merge branch 'collapse-expand-align-comment' of https://github.com/alectrocute/lemmy-ui into collapse-expand-align-comment

13 months agomake suggested change
Alec Armbruster [Sun, 11 Jun 2023 14:06:10 +0000 (10:06 -0400)]
make suggested change

13 months agoMerge branch 'main' into collapse-expand-align-comment
SleeplessOne1917 [Sun, 11 Jun 2023 14:01:24 +0000 (14:01 +0000)]
Merge branch 'main' into collapse-expand-align-comment

13 months agomove expand/collapse button
Alec Armbruster [Sun, 11 Jun 2023 13:53:08 +0000 (09:53 -0400)]
move expand/collapse button

13 months agoMerge pull request #1170 from MageJohn/main
SleeplessOne1917 [Sun, 11 Jun 2023 13:19:50 +0000 (13:19 +0000)]
Merge pull request #1170 from MageJohn/main

13 months agoSpecify package manager version in package.json
Yuri Pieters [Sun, 11 Jun 2023 12:37:53 +0000 (13:37 +0100)]
Specify package manager version in package.json

This setting is picked up by Corepack, and it's a way for others to concretely know which package manager they should use.

13 months agoMerge pull request #1145 from Adam-Shea/main
SleeplessOne1917 [Sat, 10 Jun 2023 12:15:03 +0000 (12:15 +0000)]
Merge pull request #1145 from Adam-Shea/main

Added additional keybinds

13 months agoRemove unnecessary comments
Adam Shea [Sat, 10 Jun 2023 12:12:48 +0000 (12:12 +0000)]
Remove unnecessary comments

13 months agoAdded additional keybinds
Adam Shea [Sat, 10 Jun 2023 09:15:22 +0000 (09:15 +0000)]
Added additional keybinds

13 months agoMerge pull request #1125 from skspade/1078-language-select-disable-warning
SleeplessOne1917 [Sat, 10 Jun 2023 01:00:34 +0000 (01:00 +0000)]
Merge pull request #1125 from skspade/1078-language-select-disable-warning

fix: Adds ability to hide language warning

13 months agoMerge branch 'main' into 1078-language-select-disable-warning
SleeplessOne1917 [Sat, 10 Jun 2023 00:58:04 +0000 (00:58 +0000)]
Merge branch 'main' into 1078-language-select-disable-warning

13 months agoMerge pull request #1140 from fheft/hide_saved_profile_tab
SleeplessOne1917 [Sat, 10 Jun 2023 00:50:14 +0000 (00:50 +0000)]
Merge pull request #1140 from fheft/hide_saved_profile_tab

Only show 'saved' tab on own profile page

13 months agoOnly show 'saved' tab on own profile page
Florian Heft [Fri, 9 Jun 2023 23:08:08 +0000 (01:08 +0200)]
Only show 'saved' tab on own profile page

* Users can't view saved posts of other users.
* fixes #1090

13 months agoMerge pull request #1136 from Adam-Shea/main
SleeplessOne1917 [Fri, 9 Jun 2023 22:29:47 +0000 (22:29 +0000)]
Merge pull request #1136 from Adam-Shea/main

13 months agoAdded Ctrl-K keybind
Adam Shea [Fri, 9 Jun 2023 21:30:12 +0000 (21:30 +0000)]
Added Ctrl-K keybind

13 months agoMerge branch 'main' into 1078-language-select-disable-warning
SleeplessOne1917 [Fri, 9 Jun 2023 16:41:28 +0000 (16:41 +0000)]
Merge branch 'main' into 1078-language-select-disable-warning

13 months agoFix quotes (#1131)
Nutomic [Fri, 9 Jun 2023 13:00:45 +0000 (15:00 +0200)]
Fix quotes (#1131)

Need to replace before rendering markdown, not after

13 months agoAlternative way to sanitize isoData (#1129)
Nutomic [Fri, 9 Jun 2023 12:17:02 +0000 (14:17 +0200)]
Alternative way to sanitize isoData (#1129)

* Alternative way to sanitize isoData

* use split/join instead of replaceAll

* Use sanitize, then restore > chars for markdown render

13 months agochore: switched to enabling language warning by prop rather than disabling
Sean Spade [Fri, 9 Jun 2023 03:29:24 +0000 (23:29 -0400)]
chore: switched to enabling language warning by prop rather than disabling

13 months agofix: Adds ability to hide language warning
Sean Spade [Thu, 8 Jun 2023 23:42:39 +0000 (19:42 -0400)]
fix: Adds ability to hide language warning

13 months agoMerge pull request #1118 from mr00z/main
SleeplessOne1917 [Thu, 8 Jun 2023 19:34:34 +0000 (19:34 +0000)]
Merge pull request #1118 from mr00z/main

13 months agostyles(#1067): Run prettier
Marcin Mróz [Thu, 8 Jun 2023 19:08:28 +0000 (21:08 +0200)]
styles(#1067): Run prettier

13 months agofix(#1067): Fix language not updating when editing post
Marcin Mróz [Thu, 8 Jun 2023 18:48:32 +0000 (20:48 +0200)]
fix(#1067): Fix language not updating when editing post

13 months agoFix isoData can contain user generated content (#1114)
0xDEADCADE [Thu, 8 Jun 2023 15:15:03 +0000 (15:15 +0000)]
Fix isoData can contain user generated content (#1114)

* Fix isoData can contain user generated content

* Fix formatting

13 months agoMerge pull request #1092 from thomasdouwes/patch-1
SleeplessOne1917 [Tue, 6 Jun 2023 13:15:47 +0000 (13:15 +0000)]
Merge pull request #1092 from thomasdouwes/patch-1

13 months agoAdd media-src * to Content-Security-Policy header
Thomas [Tue, 6 Jun 2023 12:45:17 +0000 (13:45 +0100)]
Add media-src * to Content-Security-Policy header

13 months agoMerge pull request #1089 from jwhitmarsh/fix/1039
SleeplessOne1917 [Mon, 5 Jun 2023 23:30:31 +0000 (23:30 +0000)]
Merge pull request #1089 from jwhitmarsh/fix/1039

Refactor lets to consts

13 months agoMerge branch 'main' into fix/1039
SleeplessOne1917 [Mon, 5 Jun 2023 23:27:50 +0000 (23:27 +0000)]
Merge branch 'main' into fix/1039

13 months agoMerge pull request #1088 from jwhitmarsh/fix/1079
SleeplessOne1917 [Mon, 5 Jun 2023 23:26:23 +0000 (23:26 +0000)]
Merge pull request #1088 from jwhitmarsh/fix/1079

Fix aria-label for language select

13 months agoRefactor lets to consts
James Whitmarsh [Mon, 5 Jun 2023 21:31:12 +0000 (22:31 +0100)]
Refactor lets to consts

13 months agoFix aria-label for language select
James Whitmarsh [Mon, 5 Jun 2023 21:06:54 +0000 (22:06 +0100)]
Fix aria-label for language select

13 months agoAdd aria attribute to track toggle status of up/down votes. (#1074)
SleeplessOne1917 [Mon, 5 Jun 2023 15:49:03 +0000 (15:49 +0000)]
Add aria attribute to track toggle status of up/down votes. (#1074)

13 months agoMerge pull request #1063 from mezzode/fix-sorting-help-url
SleeplessOne1917 [Sat, 3 Jun 2023 19:34:10 +0000 (19:34 +0000)]
Merge pull request #1063 from mezzode/fix-sorting-help-url

Fix sorting help link

13 months agoMerge branch 'main' into fix-sorting-help-url
SleeplessOne1917 [Sat, 3 Jun 2023 19:32:06 +0000 (19:32 +0000)]
Merge branch 'main' into fix-sorting-help-url

13 months agoMerge pull request #1064 from mezzode/fix-contributing-link
SleeplessOne1917 [Sat, 3 Jun 2023 19:25:13 +0000 (19:25 +0000)]
Merge pull request #1064 from mezzode/fix-contributing-link

Fix CONTRIBUTING link

13 months agoFix CONTRIBUTING link
mezzode [Sat, 3 Jun 2023 05:25:40 +0000 (22:25 -0700)]
Fix CONTRIBUTING link

13 months agoFix sorting help link
mezzode [Sat, 3 Jun 2023 05:18:00 +0000 (22:18 -0700)]
Fix sorting help link

13 months agoDo not refresh when community is selected in create post (#1042)
SleeplessOne1917 [Mon, 29 May 2023 13:01:52 +0000 (13:01 +0000)]
Do not refresh when community is selected in create post (#1042)

13 months agoUpdate translations (#1041)
SleeplessOne1917 [Mon, 29 May 2023 10:07:31 +0000 (10:07 +0000)]
Update translations (#1041)

13 months agoMerge pull request #1036 from LemmyNet/language-tag-changes
SleeplessOne1917 [Sun, 28 May 2023 23:01:43 +0000 (23:01 +0000)]
Merge pull request #1036 from LemmyNet/language-tag-changes

Changes to language tag

13 months agoremove badge-muted
Felix Ableitner [Thu, 25 May 2023 08:52:00 +0000 (10:52 +0200)]
remove badge-muted

13 months agoMerge branch 'main' into language-tag-changes
SleeplessOne1917 [Wed, 24 May 2023 13:34:04 +0000 (13:34 +0000)]
Merge branch 'main' into language-tag-changes

13 months agoMerge pull request #1031 from SleeplessOne1917/rate-limiting-tab
SleeplessOne1917 [Wed, 24 May 2023 13:33:05 +0000 (13:33 +0000)]
Merge pull request #1031 from SleeplessOne1917/rate-limiting-tab

Rate limiting tab

13 months agoMerge branch 'main' into rate-limiting-tab
SleeplessOne1917 [Wed, 24 May 2023 13:31:12 +0000 (13:31 +0000)]
Merge branch 'main' into rate-limiting-tab

13 months agouse badge-muted
Felix Ableitner [Wed, 24 May 2023 10:22:24 +0000 (12:22 +0200)]
use badge-muted

13 months agoNavbar fix 2 (#1038)
SleeplessOne1917 [Wed, 24 May 2023 00:42:19 +0000 (00:42 +0000)]
Navbar fix 2 (#1038)

* Fix navbar not closing on mobile when it should

* Get rid of unnecessary HTML tags

* Forgot to include this

13 months agoMerge branch 'rate-limiting-tab' of https://github.com/SleeplessOne1917/lemmy-ui...
abias [Tue, 23 May 2023 23:31:58 +0000 (19:31 -0400)]
Merge branch 'rate-limiting-tab' of https://github.com/SleeplessOne1917/lemmy-ui into rate-limiting-tab

13 months agoAdd translations
abias [Tue, 23 May 2023 23:31:33 +0000 (19:31 -0400)]
Add translations

13 months agoMerge branch 'main' into rate-limiting-tab
abias [Tue, 23 May 2023 23:14:44 +0000 (19:14 -0400)]
Merge branch 'main' into rate-limiting-tab

13 months agoMerge pull request #1024 from SleeplessOne1917/nicer-error-hnadling
SleeplessOne1917 [Tue, 23 May 2023 23:09:41 +0000 (23:09 +0000)]
Merge pull request #1024 from SleeplessOne1917/nicer-error-hnadling

Nicer error handling

13 months agoMerge branch 'main' into nicer-error-hnadling
SleeplessOne1917 [Tue, 23 May 2023 23:07:23 +0000 (23:07 +0000)]
Merge branch 'main' into nicer-error-hnadling

13 months agoMerge branch 'main' into rate-limiting-tab
SleeplessOne1917 [Tue, 23 May 2023 23:06:38 +0000 (23:06 +0000)]
Merge branch 'main' into rate-limiting-tab

13 months agoLint fix (#1035)
SleeplessOne1917 [Tue, 23 May 2023 22:55:36 +0000 (22:55 +0000)]
Lint fix (#1035)

* User HTTP instead of HTTPS when fetching icon in docker internal network

* Add debug statement.

* Revert "Add debug statement."

This reverts commit 7fbb12a4bde29d72c1bf55e0d0a954f19c863b4a.

* Revert "User HTTP instead of HTTPS when fetching icon in docker internal network"

This reverts commit 498de660bac1bffe15fef74a898c6d669794196a.

* Always replace host with internal host

* Fix lint script

* Remove prettier from pre-commit

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
13 months agoChanges to language tag
Felix Ableitner [Tue, 23 May 2023 20:16:54 +0000 (22:16 +0200)]
Changes to language tag

- Dont use bright white color because its not that important
- Hide tag in case of undetermined (doesnt add any information)

13 months agoHopefully stop lint command from erroring
abias [Tue, 23 May 2023 12:34:20 +0000 (08:34 -0400)]
Hopefully stop lint command from erroring

13 months agoMerge branch 'nicer-error-hnadling' of https://github.com/SleeplessOne1917/lemmy...
abias [Tue, 23 May 2023 12:10:28 +0000 (08:10 -0400)]
Merge branch 'nicer-error-hnadling' of https://github.com/SleeplessOne1917/lemmy-ui into nicer-error-hnadling

13 months agoRun prettier
abias [Tue, 23 May 2023 12:10:13 +0000 (08:10 -0400)]
Run prettier

13 months agoMerge branch 'main' into nicer-error-hnadling
SleeplessOne1917 [Tue, 23 May 2023 12:07:08 +0000 (12:07 +0000)]
Merge branch 'main' into nicer-error-hnadling