cherry pick main to dev part 3 #5886
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
goapunk
force-pushed
the
jd-2024-12-cherry-pick-main-part-2
branch
from
4247b68 to
8d4c6b7
Compare
goapunk
force-pushed
the
jd-2024-12-cherry-pick-main-part-3
branch
from
5609ddb to
8736f50
Compare
goapunk
changed the base branch from
jd-2024-12-cherry-pick-main-part-2
to
dev
goapunk
force-pushed
the
jd-2024-12-cherry-pick-main-part-3
branch
3 times, most recently
from
6e4827b to
a1ca8e3
Compare
|
I've added a new commit to the end which modifies the plan serializer, this way the ci passes |
goapunk
force-pushed
the
jd-2024-12-cherry-pick-main-part-3
branch
from
a1ca8e3 to
9fc182f
Compare
get the bplan objects. This would cause any new migration which added a new field to the model to fail.
… encoded image as required by diplan
…ncate the input if too long
string containing (geo)json, not actual json
- add missing <i> tag to allow italic in Bleach config - add missing css for text sizing via ckeditor fixes #5925
also fixes bug tile_image used instead of image_url
goapunk
force-pushed
the
jd-2024-12-cherry-pick-main-part-3
branch
from
9fc182f to
79792e4
Compare
goapunk
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Briefly explain what you did and provide context for a clearer understanding.
Tasks