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.

Sign up for GitHub

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

Jump to bottom

Upmerge 8.2 #3550

Merged
merged 17 commits into from
Jun 29, 2023
Merged

Upmerge 8.2 #3550

merged 17 commits into from
Jun 29, 2023

Commits on Jun 21, 2023

  1. WIP: BUGFIX: Dont remove every span tags around content in inline mode

    @mhsdesign
    mhsdesign committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    034fe0e View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. TASK: Translated using Weblate (Dutch) 

    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 <[email protected]>
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
    @weblate
    weblate and weblate committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    3b715e2 View commit details
    Browse the repository at this point in the history

  2. TASK: Translated using Weblate (Dutch) 

    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 <[email protected]>
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
    @weblate
    weblate and weblate committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    170aaf1 View commit details
    Browse the repository at this point in the history

  3. TASK: Translated using Weblate (Dutch) 

    Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: Mark Kuiphuis <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/nl/
Translation: Neos/Neos.Ui - Main - 8.1
    @weblate
    weblate and Mark Kuiphuis committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    336801d View commit details
    Browse the repository at this point in the history

  4. TASK: Translated using Weblate (Dutch) 

    Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: Mark Kuiphuis <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/nl/
Translation: Neos/Neos.Ui - Main - 8.0
    @weblate
    weblate and Mark Kuiphuis committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    04d21bd View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. BUGFIX: Fix inline ckeditor mode 

    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.
    @mhsdesign
    mhsdesign committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    7c9fc84 View commit details
    Browse the repository at this point in the history

  2. TASK: Translated using Weblate (Spanish) 

    Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: gallegonovato <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-1/es/
Translation: Neos/Neos.Ui - Main - 8.1
    @weblate
    weblate and gallegonovato committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    ba6e816 View commit details
    Browse the repository at this point in the history

  3. TASK: Translated using Weblate (Spanish) 

    Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: gallegonovato <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-8-0/es/
Translation: Neos/Neos.Ui - Main - 8.0
    @weblate
    weblate and gallegonovato committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    263c329 View commit details
    Browse the repository at this point in the history

  4. TASK: Translated using Weblate (Spanish) 

    Currently translated at 100.0% (110 of 110 strings)

Co-authored-by: gallegonovato <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/neos/neos-ui-main-7-3/es/
Translation: Neos/Neos.Ui - Main - 7.3
    @weblate
    weblate and gallegonovato committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    14e1a0b View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/7.3' into bugfix/ckeditorInvalid… 

    …HtmlUnclosedSpanTags
    @mhsdesign
    mhsdesign committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    3da3845 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. TASK: Add manual CKEditor Test

    @mhsdesign
    mhsdesign committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    c2d3da1 View commit details
    Browse the repository at this point in the history

  2. TASK: Revert not isLimit: true on paragraph as one cannot turn it i… 

    …nto headlines
    @mhsdesign
    mhsdesign committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    edbf0d6 View commit details
    Browse the repository at this point in the history

  3. BUGFIX: Fix cleanupContentBeforeCommit and add test 

    Fix bug in the case you had multiple paragraphs and a headline and switched to autoparagrahp: false
    @mhsdesign
    mhsdesign committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    bdd46a5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request neos#3532 from neos/bugfix/ckeditorInvalidHtmlUncl… 

    …osedSpanTags

BUGFIX: Fix ckeditor inline mode `autoparagraph: false`
    @mhsdesign
    mhsdesign authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    c14c6a7 View commit details
    Browse the repository at this point in the history

  5. Merge branch '7.3' into 8.0

    @crydotsnake
    crydotsnake committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    430176c View commit details
    Browse the repository at this point in the history

  6. Merge branch '8.0' into 8.1

    @crydotsnake
    crydotsnake committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    4e99326 View commit details
    Browse the repository at this point in the history

  7. Merge branch '8.1' into 8.2

    @crydotsnake
    crydotsnake committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    cb38b0b View commit details
    Browse the repository at this point in the history