jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1054 commits 2 branches 0 tags 27 MiB
Commit graph

1054 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yohan Boniface
03b6f94a79
Merge pull request #1142 from umap-project/no-templates-dirs 
Remove `DIRS` from `settings.TEMPLATES`
 2023-06-15 07:37:59 +02:00
David Larlet
bb8d233411
Remove DIRS from settings.TEMPLATES 
It’s more convenient to let the sub-themes declare their own templates (especially with `'APP_DIRS': True`).
 2023-06-14 21:15:37 -04:00
remco
411b3245c3 Fix #406 for easy installing on ubuntu 2023-06-14 21:47:37 +02:00
remco
c0063d2fa2 Fix permisson problem, use suggestion from #407 2023-06-14 21:47:37 +02:00
Yohan Boniface
0076614ee8
Merge pull request #1141 from umap-project/1140-allow-geo-scheme 
Allow `geo:` scheme in (description) links
 2023-06-14 19:01:43 +02:00
David Larlet
8400d9f03a
Even better with a test 
Refs 4fca2cccca
 2023-06-14 12:59:44 -04:00
David Larlet
4fca2cccca
Allow geo: scheme in (description) links 
Fix #1140
 2023-06-14 12:56:32 -04:00
Yohan Boniface
186480ea01
Merge pull request #1138 from umap-project/search-count 
Display the number of maps on search results page
 2023-06-14 16:03:38 +02:00
David Larlet
3edad3976d
Display the number of maps on search results page 2023-06-14 09:58:48 -04:00
Yohan Boniface
60ac2dc83a
Merge pull request #1132 from umap-project/icon-opacity 
Icon opacity
 2023-06-13 21:58:59 +02:00
Yohan Boniface
65628fe202 make lebab :p 2023-06-08 14:46:50 +02:00
Yohan Boniface
6efa674884 Allow to control icon opacity 
fix #236
 2023-06-08 10:09:31 +02:00
Yohan Boniface
5870d55fff Remove L.U.Icon._setColor 
Let's use setIconStyles from Leaflet instead
 2023-06-08 09:53:18 +02:00
Yohan Boniface
8ab1c4ea2d 1.3.3 2023-06-07 10:49:27 +02:00
Yohan Boniface
74844f53a3 i18n 2023-06-07 09:12:33 +02:00
Yohan Boniface
1eec9011ff i18n 2023-06-07 09:11:45 +02:00
Yohan Boniface
bf4ef5aeca i18n 2023-06-06 23:16:28 +02:00
David Larlet
fca9e6a124
Merge pull request #1129 from umap-project/explicit-version 
Display the current version + link to changelog
 2023-06-06 14:12:59 -04:00
David Larlet
fad196bff7
Display the current version + link to changelog 2023-06-06 14:05:35 -04:00
Yohan Boniface
d034e89034
Merge pull request #1128 from umap-project/1126-scroll-on-popup-overflow 
Avoid popup content to extend beyond the space allowed
 2023-06-06 18:44:04 +02:00
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