Closed t-works closed 2 years ago
After #672, #673 and #674 land on 4.x and get merged to 5.x we should simplify this PR.
After #672, #673 and #674 land on 4.x and get merged to 5.x we should simplify this PR.
Merged, so we just need a 4.x into 5.x merge
After #672, #673 and #674 land on 4.x and get merged to 5.x we should simplify this PR.
Merged, so we just need a 4.x into 5.x merge
Yes, do you have time for it? I will tonight or tomorrow probably.
Yes, do you have time for it? I will tonight or tomorrow probably.
done
Could you please rebase your PR and fix merge conflicts?
Could you please rebase your PR and fix merge conflicts?
Could you please rebase your PR and fix merge conflicts?
For the record @t-works, jordisala is adding functional tests with some of your fixes here https://github.com/sonata-project/SonataFormatterBundle/pull/679. I recommend you to wait before fixing the conflict ; in order to see if there are more bugs to fix on the 5.x branch.
Could you please rebase your PR and fix merge conflicts?
Ok I'll try to do this Today.
Best Regards Jerzy Kurowski
On Sun, Jun 12, 2022 at 8:11 PM Sonata CI @.***> wrote:
Could you please rebase your PR and fix merge conflicts?
— Reply to this email directly, view it on GitHub https://github.com/sonata-project/SonataFormatterBundle/pull/671#issuecomment-1153250939, or unsubscribe https://github.com/notifications/unsubscribe-auth/AJDRXYLR2VZ4TN477XPIP7TVOYR3LANCNFSM5YQOD2AQ . You are receiving this because you authored the thread.Message ID: @.***>
Could you please rebase your PR and fix merge conflicts?
Subject
I am targeting this branch, because this fixes issues in current branch 5.x and because it is supposed to work && tested with symfony 6.1+.
I fixed issues preventing CKEditor upload and browsing Closes #669
Changelog
FIXED: CKEditor upload and browse files with symfony 6.1 and doctrine-orm-admin-bundle