-
Notifications
You must be signed in to change notification settings - Fork 751
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
Feature/5101 ck editor option to resize images on upload #5123
Feature/5101 ck editor option to resize images on upload #5123
Conversation
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
…p-address-with-proxy Feature/eventlog ip address with proxy
Migrate moment to dayjs for Dnn.PersonaBar.UI
* HTML tags are added to array * Reverting back <> replace breaks other features Co-authored-by: armaganpekatik <armagan.pekatik@trilogy.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me but not sure how this works with the other PR with regards to merge conflicts.
Thanks, I have been wondering that too, but given the fact that the changes from #5122 are also shown in the changes here, it looks like the easiest thing would be to just merge this one. |
Just chiming in on the logistics of the "stacked commits". We can still manage these PRs independently. The branch for this PR will just need to be rebased once #5122 is merged. |
I agree, let's resolve #5122 and come back to this one, happy to help with the rebase if any conflicts arise. |
I merged the most recent develop branch into this one before crafting the pull request, so merging should be fairly easy and without conflicts? |
It seemed to me that both would be more related than they actually turned out be. I appreciate all your (and @donker , @david-poindexter ) efforts to get this merged in, by the way. |
Upgrade caniuse-lite from 1.0.30001249 to 1.0.30001339
This reverts commit 7becbf7.
… keep Telerik or to remove Telerik (dnnsoftware#5093) * Relocated TelerikUtils for reuse * Fixed TelerikUtils locking files in bin folder * TelerikUtils skip system files * Added Telerik check to Upgrade Wizard * Renamed variable for consistency
Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn
Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.dnn
@valadas I obviously messed up trying to rebase this thing on release/9.11.0 as there are now a lot of changed files. Do you have any advice? |
Not knowing what went wrong, it's hard to advise on it. But above you have the list of commits, if you know the ones that should be part of this unit of work, you can copy their hash code, create a new clean branch based on release/9.11.0 and then cherry-pick those hashes into it to redo a new pr. https://git-scm.com/docs/git-cherry-pick |
1 similar comment
Not knowing what went wrong, it's hard to advise on it. But above you have the list of commits, if you know the ones that should be part of this unit of work, you can copy their hash code, create a new clean branch based on release/9.11.0 and then cherry-pick those hashes into it to redo a new pr. https://git-scm.com/docs/git-cherry-pick |
That turned out to be easier than I thought. New PR is #5128 . I'll close this one. |
Closes #5101
This PR is built on PR #5122 which was submitted for #5100, but is not necessarily related.
Summary
This PR adds settings for:
And will resize any uploaded image to fit within these dimension on upload.
Since pictures are becoming larger and larger, it can be important on many portals, to have this automatic resize option, to allow users uncapable of resizing images themselves, to upload reasonably sized images.