Commit graph

2534 commits

Author SHA1 Message Date
David Larlet
c5b6f8d191
Add dates to the recent changelog 2023-06-06 12:41:11 -04:00
David Larlet
b1179a7443
Avoid popup content to extend beyond the space allowed
Fix #1126
2023-06-06 09:10:51 -04:00
Yohan Boniface
33e85703a3
Merge pull request #1124 from umap-project/add-funding
Add Liberapay funding
2023-06-05 18:55:47 +02:00
Yohan Boniface
2095524424 Add Liberapay funding 2023-06-05 18:15:22 +02:00
Yohan Boniface
b8b9e791ec
Merge pull request #1123 from jpetazzo/tweak-compose-file
Tweak Compose file so that it works out of the box
2023-06-05 17:48:15 +02:00
Jérôme Petazzoni
444d913d85 Tweak Compose file so that it works out of the box
Fix umap image reference to match the one pushed on Docker Hub.

Also change port to an env var with a default value,
so that it works out of the box but can also be easily
changed to another port if needed.
2023-06-05 17:42:08 +02:00
Yohan Boniface
4b502e9857 Merge branch 'docker' 2023-06-05 17:00:46 +02:00
Yohan Boniface
7dac5b2994 Very minimal doc for Docker install 2023-06-05 16:59:49 +02:00
Yohan Boniface
8ce951dd53 Add comments in Dockerfile 2023-06-05 16:30:50 +02:00
Yohan Boniface
efdda1adac Better cache npm install in Docker build
I also add to install git, no idea why it was working before
and not after this change :/
2023-06-05 16:09:12 +02:00
Yohan Boniface
3856cd447b Use layers to build Docker image
Better cache and lighter image, yay.
2023-06-05 15:44:32 +02:00
Yohan Boniface
faebeebbdf INTERNAL_IPS should default to a list 2023-06-05 15:08:19 +02:00
Yohan Boniface
00f34c45ba Handle OpenStreetMap OAuth by default 2023-06-05 14:48:55 +02:00
Yohan Boniface
5190c46bf6 Do not track Dockerfile, not to invalidate Docker cache at each change 2023-06-05 14:44:33 +02:00
Yohan Boniface
c665dba082 Add a basic docker-compose.yml as example 2023-06-05 14:33:26 +02:00
Yohan Boniface
d7d47bf508 Remove unused data folder from Dockerfile 2023-06-05 13:57:32 +02:00
Yohan Boniface
e1d3a95cce Allow to make vendors without Makefile
So we can use a lighter node image in Docker
2023-06-05 13:19:14 +02:00
Yohan Boniface
76ed5b9c4f Move docker utils under a dedicated folder 2023-06-05 12:26:50 +02:00
Yohan Boniface
b749b734c7 Use python 3.11 in docker 2023-06-05 12:17:45 +02:00
Yohan Boniface
e322358b51 Add .dockerignore 2023-06-05 12:03:54 +02:00
Yohan Boniface
24d4a5d488 Remove requirements-docker.txt 2023-06-05 12:03:42 +02:00
Yohan Boniface
cf071eda85 Remove mocha-phantomjs for now, as it sometimes break Docker build 2023-06-05 11:49:36 +02:00
Yohan Boniface
96ca298a28 Remove unused code 2023-06-05 11:49:21 +02:00
Yohan Boniface
40f694f460 Make Docker happy with Makefile syntax 2023-06-05 11:48:46 +02:00
Yohan Boniface
5e201b44fb Use django-environ to make part of the settings available throught env vars 2023-06-05 11:48:21 +02:00
Yohan Boniface
9fc1c3f336 i18n 2023-06-05 09:22:31 +02:00
Yohan Boniface
6f1fb4a6ad 1.3.2 2023-06-04 08:54:42 +02:00
Yohan Boniface
06c156ffcf i18n 2023-06-04 08:52:03 +02:00
Yohan Boniface
863c2e18d2 Display username in edit-toolbar when logged in 2023-06-04 08:45:10 +02:00
Yohan Boniface
51a904dc07 Only return anonymous_url in anonymous context
Otherwise the frontend will treat map as anonymous even with
and owner and display a wrong message creation.

Also, this edit URL does not make sense (and will not work)
when there is an owner.
2023-06-04 08:05:48 +02:00
Yohan Boniface
90f7680d8d 1.3.1 2023-06-03 08:29:18 +02:00
Yohan Boniface
6e0c4723a4
Merge pull request #1102 from umap-project/mail-link
Add a button to send edit link by email in anonymous mode
2023-06-02 23:32:34 +02:00
Yohan Boniface
1b791347d8 Also catch InvalidURL in ajax-proxy
fix #1119
2023-06-02 22:45:13 +02:00
Yohan Boniface
39a887a6f6 Also catch URLError in ajax-proxy
fix #1118
2023-06-02 22:36:02 +02:00
Yohan Boniface
e1b18c5daf
Merge pull request #1117 from umap-project/table-break-word
Fix width of columns in popups and tables
2023-06-02 21:06:47 +02:00
David Larlet
8b1b36f740
Fix width of columns in popups and tables
See https://umap.openstreetmap.fr/en/map/example01_923828#5/53.606/9.009 for example
2023-06-02 14:24:28 -04:00
David Larlet
4ba1946868
Fix test about subject
Introduced in 5460876ff4
2023-06-02 11:54:44 -04:00
David Larlet
bf4a84de99
Apply black on test map views file 2023-06-02 11:54:09 -04:00
David Larlet
725feb8d01
Fallback to copy to clipboard without HTTPS 2023-06-02 11:50:03 -04:00
David Larlet
ca97a4d745
Bump constrasts on buttons 2023-06-02 11:41:40 -04:00
Yohan Boniface
309db975af
Merge branch 'master' into master 2023-06-02 17:34:49 +02:00
Yohan Boniface
5460876ff4
Update umap/views.py
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-06-02 17:33:09 +02:00
Yohan Boniface
3722eacb08 Remove django-leaflet-storage and leaflet.storage from README
Those have been integrated into uMap itself since 1.0
2023-06-02 16:49:50 +02:00
Yohan Boniface
d180caa0d5 Fix closing alert on callback 2023-06-01 09:32:44 +02:00
Yohan Boniface
cfe6bdf2a8 Fix closing the alert when clicking on an action button 2023-05-31 18:40:52 +02:00
Yohan Boniface
5d6afdfb1b Add a "Copy link" button near to the anonymous edit link 2023-05-31 18:32:51 +02:00
Yohan Boniface
8f77b63b08 Changed working of edit link alert + added a carriage return 2023-05-31 17:33:05 +02:00
Yohan Boniface
7c2ba9d3e8 Add doc for email sending 2023-05-31 17:26:48 +02:00
Yohan Boniface
e0760ca403 Only ask to send edit link if email has been set up 2023-05-31 17:20:22 +02:00
Yohan Boniface
8f52d34bb2 WIP: final bit to make sending edit link working 2023-05-31 17:05:57 +02:00