Commit graph

2622 commits

Author SHA1 Message Date
Yohan Boniface
5b7fec5f9b
Merge pull request #1314 from openbrian/docker-compose-app-depends-on-db
Replace wait_for_database with depends_on and healthcheck.
2023-09-21 10:11:56 +02:00
Brian DeRocher
6720f76d85 Set the map option. No need for setting boolean from query string.
Only add the owner property if the feature flag (map.options.featuresHaveOwner) is enabled.

Default to features do NOT have owners.
2023-09-20 13:16:52 -04:00
Brian DeRocher
77b56623ed Remove field from map settings form. 2023-09-20 13:07:12 -04:00
Brian DeRocher
6c58bf367d Use camelcase and fix typo. 2023-09-20 13:03:36 -04:00
Brian DeRocher
e25fb5d04f Add FeaturesHaveOwners map option.
WIP
2023-09-20 12:48:32 -04:00
Yohan Boniface
0988f2e2ee
Merge pull request #1320 from jvmatl/docker_quickstart_docs
A more newbie-friendly Docker HOWTO
2023-09-20 18:36:05 +02:00
John Martinez
7e2b20d085
Update docs/docker.md
Co-authored-by: Yohan Boniface <yohanboniface@free.fr>
2023-09-20 12:07:58 -04:00
Brian DeRocher
e76c147b65 owner is no longer a form field. 2023-09-20 10:53:27 -04:00
Brian DeRocher
35e37c2d4b Add translation for "owner". 2023-09-20 10:52:13 -04:00
Brian DeRocher
e2b789e575 Do not use the form for the owner property.
Only add the owner property to defaultProperties, if there is a user.  In other words the user can use the map without logging in.
2023-09-20 10:51:01 -04:00
Brian DeRocher
204db34282 Replace bash based waiting with python based django-probes. 2023-09-20 09:45:26 -04:00
Yohan Boniface
99831dc04d
Merge pull request #1326 from umap-project/dashboard-duplicate-map
Fix map displayed more than once in user dashboard when multiple editors
2023-09-20 15:17:38 +02:00
Yohan Boniface
f6730a9829
Update umap/views.py
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-09-20 15:17:29 +02:00
Yohan Boniface
43e5391c49 Fix map displayed more than once in user dashboard when multiple editors
fix #1325
2023-09-20 11:30:05 +02:00
Yohan Boniface
d48b272837
Merge pull request #1323 from umap-project/better-document-secret-key
Better documentation for the SECRET_KEY setting
2023-09-20 08:04:00 +02:00
Yohan Boniface
5587632168
Merge pull request #1322 from jvmatl/ubuntu_from_scratch_feedback
Ran through the 'Ubuntu from Scratch' procedure using a fresh Ubuntu 22.04.3 LTS VM and took notes on what worked and what didn't.
2023-09-20 08:02:47 +02:00
Brian DeRocher
9c89c50560 Set a default property for features that the owner is the current user.
https://github.com/umap-project/umap/issues/430
2023-09-19 19:13:14 -04:00
David Larlet
408fcb7c0f
Revert "Add link to django docs for SECRET_KEY"
This reverts commit e2eb510854.
2023-09-19 14:59:31 -04:00
John Martinez
7134269218
Update docs/ubuntu.md
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-09-19 14:58:21 -04:00
David Larlet
84c00fa5ba
Better documentation for the SECRET_KEY setting
See https://github.com/umap-project/umap/pull/1322#issuecomment-1726300269
2023-09-19 14:52:57 -04:00
John Martinez
e2eb510854 Add link to django docs for SECRET_KEY 2023-09-19 18:49:21 +00:00
John Martinez
93cfe80370
Update docs/docker.md
typo

Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-09-19 14:44:31 -04:00
John Martinez
74fd3f4a66
Update docs/docker.md
Typo

Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-09-19 14:43:51 -04:00
John Martinez
2f21d7b821
Update docs/docker.md
punctuation

Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-09-19 14:41:14 -04:00
John Martinez
89cfa7d93d Ran through the 'Ubuntu from Scratch' procedure using a fresh Ubuntu 22.04.3 LTS VM and took notes on what worked and what didn't.
Here's a summary of the changes and why

* added 'apt update' before the install -- only _needed_ on a completely fresh VM, but never hurts

* added an install of the virtualenv package, because it is used later but: do you still need it AND python3-venv? I'm assuming it was done that way for a reason.

* changed indentation on the mkdir so it will format correctly

* added `-D ~postgres` to the commands executed as postgres user because the postgres user does not, by default, have permission to read into real user's home directories (at least in 22.04) and so the commands would error out

* change `source <activate>` to `. activate` because the line `sudo -u umap -i` launches `sh`, not `bash`, and `sh` does not recognize the source command. `.` works in either.

* remove the instructions to change STATIC_ROOT and MEDIA_ROOT because they are already defaulted to those values in the current version sample of local.py

* added a notice to change the SECREY_KEY and ADMINS list just because it seemed like a good idea.

Side note: I have not seen any docs anywhere that explains exactly what the secret Key does, or where it is used. It's used a magic variable in the config file.. ?

I am not currently messing with nginx or wsgi, so I can't comment on those parts.
2023-09-19 18:32:13 +00:00
John Martinez
cc9004fbc2 Code review feedback 2023-09-19 17:43:13 +00:00
John Martinez
43a35ee5fd A more newbie-friendly Docker HOWTO 2023-09-19 17:24:32 +00:00
Yohan Boniface
038a1a3c4d
Merge pull request #1315 from umap-project/dot-in-property
Remove dot in property name
2023-09-19 07:35:10 +02:00
Yohan Boniface
466d955953
Merge pull request #1316 from umap-project/fullwidth-panel-close
Fix table editor not closing anymore from fullwidth
2023-09-18 15:33:13 +02:00
Yohan Boniface
9120d54be7 Fix table editor not closing anymore from fullwidth
(From f3b5c82767)
2023-09-18 13:02:19 +02:00
Yohan Boniface
647d8910c0 Remove dot in property name
Otherwise it will break when trying to access it in FormBuilder
2023-09-18 12:21:06 +02:00
Yohan Boniface
0fa834155d changelog 2023-09-18 11:27:17 +02:00
Yohan Boniface
417dde04b0 1.7.3 2023-09-18 11:19:59 +02:00
Yohan Boniface
9f47b0fc55 i18n 2023-09-18 11:19:40 +02:00
Brian DeRocher
0c9d9f630e Replace wait_for_database with depends_on and healthcheck. 2023-09-16 11:12:50 -04:00
Yohan Boniface
0a83c42724
Merge pull request #1313 from jschleic/feature-1312
Add outlinkTarget to default interactionProperties
2023-09-15 12:15:47 +02:00
Yohan Boniface
13d398318d Tests: fix toggle edit panel check
We do not remove the panel content anymore
2023-09-15 12:11:13 +02:00
Joachim Schleicher
db31aa119e Add outlinkTarget to default interactionProperties
Fix #1312
2023-09-14 10:36:23 +02:00
David Larlet
4467b8ce2b
Merge pull request #1309 from umap-project/umap-footer-link
Add a `powered by uMap` footer
2023-09-13 17:06:18 -04:00
David Larlet
f535993201
Add a powered by uMap footer
Fix #1304
2023-09-08 17:17:11 -04:00
David Larlet
2152ca3d1a
Merge pull request #1069 from umap-project/playwright-integration-tests
Setup to create integration tests with Playwright
2023-09-08 11:24:35 -04:00
Yohan Boniface
aa1b04b3ad
Merge pull request #1298 from umap-project/fix-remotelayer-with-zoom-onload
Try to fix remote datalayer not sending dataloaded
2023-09-08 16:02:37 +02:00
Yohan Boniface
aca473692a
Merge pull request #1303 from umap-project/icons-quick-changes
Enhance icon selector form
2023-09-08 16:01:25 +02:00
Yohan Boniface
a9cd424f05
Merge pull request #1306 from umap-project/popup-img-width
Use css width for img custom width
2023-09-08 15:09:53 +02:00
Yohan Boniface
4857d7c29c Use css width for img custom width
The width attribute is the intrinsic width of the image, and thus
it will not overwrite the default CSS

cf https://forum.openstreetmap.fr/t/bugs-divers-relevees-sur-une-umap-absent-sur-une-autre/17254/5
2023-09-07 07:16:55 +02:00
Yohan Boniface
4009e759dc Prevent HTML blinking when loading icons list 2023-09-05 11:21:17 +02:00
Yohan Boniface
d72ae3fc34 Very minimal search input for icons list
fix #1302
2023-09-05 10:55:35 +02:00
Yohan Boniface
ce7575c5eb But back icon preview 2023-09-05 10:29:44 +02:00
Yohan Boniface
c5084c4332 Add toggle link to show/hide iconUrl raw input 2023-09-05 10:14:24 +02:00
Yohan Boniface
91e71eccda Change button look in icon form 2023-09-05 09:41:09 +02:00