Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upmerge 8.3 #3551

Merged
merged 25 commits into from
Jun 29, 2023
Merged

Upmerge 8.3 #3551

merged 25 commits into from
Jun 29, 2023

Conversation

crydotsnake
Copy link
Member

No description provided.

mhsdesign and others added 24 commits June 21, 2023 11:33
Currently translated at 94.5% (104 of 110 strings)

TASK: Translated using Weblate (Spanish)

Currently translated at 94.5% (104 of 110 strings)

TASK: Translated using Weblate (German)

Currently translated at 94.5% (104 of 110 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/de/
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/es/
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/nl/
Translation: Neos/Neos.Ui - Main - 8.1
Currently translated at 94.5% (104 of 110 strings)

TASK: Translated using Weblate (Spanish)

Currently translated at 94.5% (104 of 110 strings)

TASK: Translated using Weblate (German)

Currently translated at 94.5% (104 of 110 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/de/
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/es/
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/nl/
Translation: Neos/Neos.Ui - Main - 8.0
Currently translated at 94.5% (105 of 111 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-82/de/
Translation: Neos/Neos.Ui - Main - 8.2
Currently translated at 94.5% (105 of 111 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-82/nl/
Translation: Neos/Neos.Ui - Main - 8.2
Currently translated at 27.9% (31 of 111 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-82/pt/
Translation: Neos/Neos.Ui - Main - 8.2
Currently translated at 94.5% (105 of 111 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-82/es/
Translation: Neos/Neos.Ui - Main - 8.2
Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: Mark Kuiphuis <mark@kuiphuis.online>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/nl/
Translation: Neos/Neos.Ui - Main - 8.1
Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: Mark Kuiphuis <mark@kuiphuis.online>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/nl/
Translation: Neos/Neos.Ui - Main - 8.0
Currently translated at 100.0% (111 of 111 strings)

Co-authored-by: Mark Kuiphuis <mark@kuiphuis.online>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-82/nl/
Translation: Neos/Neos.Ui - Main - 8.2
Since there is still no native support for a inline ckeditor mode. ckeditor/ckeditor5#762 we will continue our hacky road ;)

This fixes several issues:
- Inserting text with newlines will now correctly insert soft breaks (br)
- We use our own pseodo `<neos-inline-wrapper>` tag to avoid the issue of having to parse html with regex and doing it wrong neos#2918

i also added a test for some inline editing behavior. (Like that there are no outer span or p tags)
But writing a tests for neos#2918 is currently impossible, as our tests currently dont use `https` which means we cant access the `navigator.clipboard` and test that ckeditor works correctly when content is pasted.
Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/es/
Translation: Neos/Neos.Ui - Main - 8.1
Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/es/
Translation: Neos/Neos.Ui - Main - 8.0
Currently translated at 100.0% (111 of 111 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-82/es/
Translation: Neos/Neos.Ui - Main - 8.2
Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-7-3/es/
Translation: Neos/Neos.Ui - Main - 7.3
Fix bug in the case you had multiple paragraphs and a headline and switched to autoparagrahp: false
…osedSpanTags

BUGFIX: Fix ckeditor inline mode `autoparagraph: false`
@github-actions github-actions bot added the 8.3 label Jun 29, 2023
@mhsdesign mhsdesign merged commit b64c8fc into neos:8.3 Jun 29, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants