4243 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Yohan Boniface	91c3b098df	wip: return data in DataLayer.importRaw	2025-04-04 18:45:31 +02:00
David Larlet	b342480f3b	fix: explicit batch instead of blindly on add data ... Co-authored-by: Yohan Boniface <yohanboniface@free.fr>	2025-04-04 11:45:26 -04:00
David Larlet	d6f591b365	fix: remote data loading on import from umap backup (#2598)	2025-04-04 11:15:23 -04:00
David Larlet	90bbc72320	fix: restore width and height for default marker icon ... Co-authored-by: Yohan Boniface <yohanboniface@free.fr>	2025-04-04 11:15:03 -04:00
David Larlet	b05e6ec28c	fix: remote data loading on import from umap backup	2025-04-04 11:05:33 -04:00
David Larlet	0e56e71e87	fix: Minimize the default svg icon for marker ... Co-authored-by: Yohan Boniface <yohanboniface@free.fr>	2025-04-04 10:28:43 -04:00
Yohan Boniface	5c51a7a735	feat: add keyboard shortcut for redo (ctrl+shift+z) (#2596) ... I've reworked a bit the shortcut handling, as it was only dealing with ctrl/meta only ones (no shift).	2025-04-04 16:25:04 +02:00
Yohan Boniface	563aee81e1	feat: add keyboard shortcut for redo (ctrl+shift+z)	2025-04-04 16:14:04 +02:00
Yohan Boniface	3720ccff01	feat: add minimal "raw" icon shape (#2597) ... Basically, it means "no shape".  It's a 48x48 max square (but if image is smaller it will stay smaller), popup and tooltip always centered. Let's see how this will be used and add more controls if needed later (like size, center position…). Also I've added a small border to the default white round icon, so it's visible even on a white background. (Not sure why the flower size is 47.8 instead of 48, cf screenshot, sounds like a Leaflet rounding issue…) cf #125	2025-04-04 16:08:04 +02:00
Yohan Boniface	9e5c985d6c	feat: add minimal "raw" icon shape	2025-04-04 12:02:46 +02:00
Yohan Boniface	32b9217bd2	feat: add Map.tags and allow to edit from client (#2530) ... cf #2283 Note: this PR uses ArrayField, which is Postgres only, so this would officially remove the support of spatialite as it is. I'm not sure at all uMap still works with spatialite, so maybe that the opportunity to either add spatialite in the CI and make sure we support it, or remove it and only target Postgres/PostGIS.	2025-04-03 18:52:17 +02:00
Yohan Boniface	4fd57e0c11	chore: remove tag icons for now ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 18:29:39 +02:00
Yohan Boniface	54420568af	chore: refine map fragment card CSS ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 18:20:50 +02:00
Yohan Boniface	8c90535105	chore: better CSS for tags in maps list ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 17:51:37 +02:00
Yohan Boniface	80a969917a	chore: simplify search form CSS and HTML ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 17:51:20 +02:00
Yohan Boniface	6582e85f18	Update the Dockerfile to expose websockets (#2576) ... The Dockerfile now uses ASGI by default (via uvicorn).	2025-04-03 17:16:56 +02:00
Yohan Boniface	023645a160	wip: make Redis service optional in Docker image ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 17:12:12 +02:00
Yohan Boniface	e24695b68c	wip: display tags in maps list	2025-04-03 14:51:04 +02:00
Yohan Boniface	db72bfad8d	wip: sort tags by label, not by value	2025-04-03 11:10:36 +02:00
Yohan Boniface	738af24dfc	chore: fix tags related test	2025-04-03 11:10:36 +02:00
Yohan Boniface	06f963c07f	chore: align search form elements ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 11:10:36 +02:00
Yohan Boniface	c6ed896a6d	feat: associate icons to tags ... Co-authored-by: David Larlet <david@larlet.fr>	2025-04-03 11:10:36 +02:00
Yohan Boniface	1344fe6b46	feat: basic filtering by tags	2025-04-03 11:10:36 +02:00
Yohan Boniface	39f38a9cdf	feat: add Map.tags and allow to edit from client ... cf #2283	2025-04-03 11:10:33 +02:00
Yohan Boniface	e2f154f62e	feat: add atomic undo redo (#2570) ... Todo: - [ ] undo/sync a version restore - [x] add test for scenario where two peers create a layer and one click on save (both should be saved) - [x] undo/sync of conditional rules - [x] undo/sync of filter management from table editor	2025-04-03 10:32:47 +02:00
Yohan Boniface	7196ffe101	chore: bump mkdocs-material from 9.6.9 to 9.6.10 (#2593)	2025-04-03 08:55:19 +02:00
Yohan Boniface	99ea09e79e	chore: bump pydantic from 2.10.6 to 2.11.1 (#2594)	2025-04-03 08:55:01 +02:00
Yohan Boniface	b3f587ccf3	chore: bump django from 5.1.7 to 5.1.8 (#2595)	2025-04-03 08:49:20 +02:00
dependabot[bot]	64cf408233	chore: bump django from 5.1.7 to 5.1.8 ... Bumps [django](https://github.com/django/django) from 5.1.7 to 5.1.8. - [Commits](https://github.com/django/django/compare/5.1.7...5.1.8) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-02 20:41:42 +00:00
dependabot[bot]	e26e8edc8a	chore: bump pydantic from 2.10.6 to 2.11.1 ... Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.10.6 to 2.11.1. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.10.6...v2.11.1) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-31 17:38:06 +00:00
dependabot[bot]	1b8e217768	chore: bump mkdocs-material from 9.6.9 to 9.6.10 ... Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.6.9 to 9.6.10. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.6.9...9.6.10) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-31 17:38:01 +00:00
Yohan Boniface	5259cab027	chore: remove saving.js import added by mistake during rebase	2025-03-28 18:00:14 +01:00
Yohan Boniface	7ede27bf0f	chore: top edit bar responsiveness ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	5807cfbbcd	wip: move undo/redo buttons to the left ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	e41ad4e069	wip: allow to sync version restore ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	c933df585c	wip: add test to make sure saving also save remote dirty datalayers	2025-03-28 18:00:14 +01:00
Yohan Boniface	50f2c08ecb	wip: do not call document during JS unittests	2025-03-28 18:00:14 +01:00
Yohan Boniface	d61e045903	wip: allow to sync/undo filter added/removed from table editor	2025-03-28 18:00:14 +01:00
Yohan Boniface	6b2038e83e	wip: permissions does not inherit from ServerStored anymore	2025-03-28 18:00:14 +01:00
Yohan Boniface	0389e9a185	wip: allow to undo/sync rules ... When editing Rule(s), we are not editing the map data itself, but a sort of proxy objects. This was done mainly because map.properties.rules is an array of object, and at this time Leaflet.FormBuilder did not know how to edit an array (something like properties.rules.0.condition). Now that we integrated FormBuilder, it still does not know how to do this but we could teach it, or find another way (real Proxy or use reference to the original object in the Rule).	2025-03-28 18:00:14 +01:00
Yohan Boniface	a2e864ad73	wip: uncreated map should always appear as dirty	2025-03-28 18:00:14 +01:00
Yohan Boniface	d0fb85d552	wip: DataLayer does not inherit anymore from ServerStored	2025-03-28 18:00:14 +01:00
Yohan Boniface	fa83764c8b	wip: allow DataLayer.clear to be sync and undone	2025-03-28 18:00:14 +01:00
Yohan Boniface	d438a007e4	wip: uMap does not inherit anymore from ServerStored ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	be52e7ca2f	wip: remove not effective code ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	172de0e2d0	wip: add permissions related fields in schema ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	77da6425c2	wip: allow to mark an operation as not undoable ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	093ed061c1	wip: tests pass ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	5cb7cb2738	fixup: make sure to toggle remote client state at save too ... Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00
Yohan Boniface	dfdfae0080	wip: derive the dirty status from the undoManager ... This should pave the way for removing the SaveManager. Co-authored-by: David Larlet <david@larlet.fr>	2025-03-28 18:00:14 +01:00