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.

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

cherry pick main to dev part 3 #5886

Merged
merged 21 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9eff472
update react-router to v7
goapunk Dec 4, 2024
2efb649
chore(deps): update babel monorepo to v7.26.3
renovate[bot] Dec 4, 2024
71ae584
fix(deps): update dependency sass-loader to v16.0.4
renovate[bot] Dec 4, 2024
0b13d8c
chore(deps): update dependency webpack to v5.97.1
renovate[bot] Dec 5, 2024
7320dba
chore(deps): update dependency @testing-library/react to v16.1.0
renovate[bot] Dec 5, 2024
c8f38af
chore(deps): update dependency lint-staged to v15.2.11
renovate[bot] Dec 10, 2024
0349dd0
apps/bplan: adapt api to the new requirements for the diplan system
goapunk Nov 18, 2024
6b785d3
apps/bplan: fix a custom migration which wasn't using `get_model` to
goapunk Nov 27, 2024
61fa1d6
fix(deps): update dependency sass to v1.83.0
renovate[bot] Dec 13, 2024
1596017
bplan: make some further adjustments to the bplan api to fix some iss…
goapunk Dec 18, 2024
c7ec081
fix(deps): update dependency @fortawesome/fontawesome-free to v6.7.2
renovate[bot] Dec 18, 2024
a5406c9
fix(deps): update dependency react-slick to v0.30.3
renovate[bot] Dec 18, 2024
c7e4526
chore(deps): update dependency stylelint to v16.12.0
renovate[bot] Dec 18, 2024
6465da4
apps/bplan: add tile_image field to serializer which accepts a base64…
goapunk Dec 19, 2024
b8c53a6
apps/bplan: revert changes for the point field back to geojson
goapunk Dec 19, 2024
0f4edda
apps/bplan: remove char limit on name and description and instead tru…
goapunk Jan 2, 2025
5b1e2da
bplan/serializer: add binary=True to point JSONField as we receive a
goapunk Jan 7, 2025
028d1e5
fix some issues with ckeditor content not shown correctly
goapunk Jan 13, 2025
6cb4032
apps/bplan: Replace imghdr with python-magic
Jan 16, 2025
0de9190
Add changelog _0002
Jan 20, 2025
79792e4
Add back file seek 0
Jan 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/5925.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Changed

- add ckeditor text size css to make text sizing work
- add <i> tag to `collapsible-image-editor` Bleach config to allow italic text
20 changes: 20 additions & 0 deletions changelog/8543.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Added

- show point field for bplans in the django-admin

### Changed

- adapt bplan api to the requirements for the diplan system
- add a new field `is_diplan` to the bplan model to be able to differentiate
between old bplans from imperia and new ones from diplan
- add the `point` field to the serializer as we no longer need to get it from
the bplan map for bplans coming from diplan
- calculate the district from the bplan identifier instead of getting it from
the bplan map
- keep compatibility with the imperia system for now but annotated code which
can be removed once the transition to diplan is completed
- update the bplan api documentation
- add a `bplan_id` field which will replace the `identifier` field once the
switch to diplan is done
- remove char limit for name and description field, instead truncate text if
too long
7 changes: 7 additions & 0 deletions changelog/_0003.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### Changed

- `imghdr` support was deprecated in python, so now we use `python-magic` and built-in `mime` to check the filetype of images files for bplans created using the API.

### Fixed

- Bug where tile_image was being used instead of image_url.
Loading