5.x

[t-works]

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

### Added
- Added service configuration for Sonata\FormatterBundle\Controller\CkeditorAdminController

### Fixed
- browser.html.twig (compatibility with doctrine-orm-admin-bundle)
- upload.html.twig 

## To do
- [ ] Fix label translation in file browser filters;
- [ ] Update the documentation;
- [ ] Allow using custom contexts. (currently using "context:  my-context" in fos_ck_editor.configs.default of tha application does not work with file browser)

[jordisala1991]

After #672, #673 and #674 land on 4.x and get merged to 5.x we should simplify this PR.

[VincentLanglet]

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

[jordisala1991]

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.

[VincentLanglet]

Yes, do you have time for it? I will tonight or tomorrow probably.

done

[SonataCI]

Could you please rebase your PR and fix merge conflicts?

[SonataCI]

Could you please rebase your PR and fix merge conflicts?

[SonataCI]

Could you please rebase your PR and fix merge conflicts?

[VincentLanglet]

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.

[SonataCI]

Could you please rebase your PR and fix merge conflicts?

[t-works]

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: @.***>

[SonataCI]

Could you please rebase your PR and fix merge conflicts?