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

2319 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yohan Boniface
b9457c0b03
Merge pull request #952 from theraser/master 
Fix German typo
 2021-09-16 11:52:06 +02:00
Ansgar Hegerfeld
d080c118b6 Fix German typo 2021-09-15 21:43:07 +02:00
dependabot[bot]
70fd85ec72
Bump pillow from 8.0.1 to 8.3.2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.0.1 to 8.3.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.0.1...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-12 08:25:11 +00:00
dependabot[bot]
f8a9706a8c
Bump django from 3.2.3 to 3.2.4 
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.3...3.2.4)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-12 08:24:48 +00:00
Yohan Boniface
e6b02724eb Merge branch 'dj3' 2021-08-06 11:12:12 +02:00
Yohan Boniface
ec11d675e9 i18n 2021-07-11 12:29:18 +02:00
Yohan Boniface
c1d7cd89da
Merge pull request #915 from donalhunt/patch-1 
redirect users back to TLS version of umap after 3rd party auth.
 2021-06-02 14:34:02 +02:00
Donal Hunt
8f1de412b8
redirect users back to TLD version of umap after 3rd party auth. 
setting "SOCIAL_AUTH_REDIRECT_IS_HTTPS = True" per https://python-social-auth.readthedocs.io/en/latest/configuration/settings.html#processing-redirects-and-urlopen
 2021-05-31 15:33:13 +01:00
Yohan Boniface
ebf0dee216 Travis stuff 2021-05-30 22:53:16 +02:00
Yohan Boniface
1200b82838 First attempt to upgrade to Django 3.X 
Bloqued by https://github.com/peopledoc/django-agnocomplete/issues/119
 2021-05-17 10:51:24 +02:00
Yohan Boniface
956549e5da
Merge pull request #862 from mstock/property-fallbacks 
Fix and enhance property fallbacks
 2021-05-17 09:57:33 +02:00
Manfred Stock
c7b78567c7 Extend regex to support original example from issue #820 and more 
The original example from issue #820 was using a dash ('-') as fallback,
however, the regular expression did not accept those. It also didn't
support white space (and many other characters) in the fallback, which
are also supported now, so one can even put e.g. links including label
in the fallback.
 2020-12-13 17:12:17 +01:00
Manfred Stock
77d9e1f4e2 Return first defined property instead of last property 
The changes done in b29adaa5 and ec275d64 introduced a property
fallback, however, this always returned the property/string in the
rightmost position, ignoring any of the previous values, even if
they were defined.
 2020-12-12 18:31:02 +01:00
Yohan Boniface
7893ff1c7d fix english typo 2020-11-09 09:54:16 +01:00
Yohan Boniface
953e8eea52 1.2.3 2020-11-09 09:18:44 +01:00
Yohan Boniface
264b2aaa5f Update Django to 2.2.17 2020-11-09 09:11:37 +01:00
Yohan Boniface
a719bdaa38 chore(travis): remove python 3.5, add 3.7, 3.8 and 3.9 2020-11-09 08:18:58 +01:00
Yohan Boniface
1c4531f70a Update map extent on first save if it still default one 
cf #841
 2020-11-09 08:09:05 +01:00
Yohan Boniface
fe7a7f5434 Fix English typo setted => set 2020-11-09 07:30:02 +01:00
Yohan Boniface
1770c31de5 i18n 2020-11-08 17:57:37 +01:00
Yohan Boniface
1afc366e11 Do not change zoom when locating user 
cf #763
 2020-11-08 17:52:45 +01:00
Yohan Boniface
eeb58a8c21 Display an error message when latlng is invalid 2020-11-08 17:43:57 +01:00
Yohan Boniface
70eec17555 fix changing map ownership broken 
cf #780
 2020-11-08 17:39:01 +01:00
Yohan Boniface
3089b71705 Prevent to redraw a marker when setting invalid latlng from edit form 
cf #799
 2020-11-08 16:49:23 +01:00
Yohan Boniface
3927a845a4 Control search API URL from uMap config 
cf #842
 2020-11-08 15:10:13 +01:00
Yohan Boniface
ec275d64fe Deal with property fallback in templating 
eg. {prop1|prop2|"default"}

cf #820
 2020-11-08 14:38:09 +01:00
Yohan Boniface
b29adaa53f Minimal fallback handling in templating 
eg. {var|defaultvalue}

cf #820
 2020-11-08 14:38:09 +01:00
Yohan Boniface
450271b1e2
Merge pull request #808 from umap-project/dependabot/pip/django-2.2.13 
Bump django from 2.2.11 to 2.2.13
 2020-11-08 09:26:12 +01:00
dependabot[bot]
d7d2c1f433
Bump django from 2.2.11 to 2.2.13 
Bumps [django](https://github.com/django/django) from 2.2.11 to 2.2.13.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.11...2.2.13)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-08 08:25:41 +00:00
Yohan Boniface
34f3c42a9b
Merge pull request #839 from mmeinert/master 
Update requirements.txt for Pillow with python3.9
 2020-11-08 09:24:56 +01:00
Michaël Meinertzhagen
19fa26a531
Update requirements.txt 
Bump Pillow version to 8.0.1
Pillow version >= 8.0 is mandatory for python3.9 (default python version on current Ubuntu LTS 20.04
 2020-11-07 12:18:44 +01:00
Remco Schoen
c0e91578b1 Added docker support 2020-05-15 17:59:08 +00:00
Duvel
d2ed8d0817
Merge pull request #1 from umap-project/master 
Merge latest master
 2020-05-15 18:13:52 +02:00
Yohan Boniface
88cd3e8cf0
Merge pull request #790 from brentfraser/master 
add Windows install info and minor typos
 2020-04-28 19:37:59 +02:00
brentfraser
a7241d6459 add note on developing 2020-04-28 11:28:48 -06:00
brentfraser
7e952b0dea typos 2020-04-26 09:46:28 -06:00
brentfraser
c5cd0e1c38 typo 2020-04-26 09:37:04 -06:00
brentfraser
bba5cda46b add Windows install info 2020-04-26 09:34:04 -06:00
Yohan Boniface
59bf9d65ab
Merge pull request #782 from umap-project/improve-popup-layout 
Improve popup and panel layout
 2020-04-19 09:04:16 +02:00
Binnette
729049aa04 Responsive images 2020-04-09 10:28:47 +02:00
Binnette
8b28536bbb Improve popup and panel layout 2020-04-09 00:08:30 +02:00
Binnette
87ae7d08ae
Merge pull request #778 from umap-project/normalize-keyboard-shortcuts 
Normalize keyboard shortcuts
 2020-03-31 20:17:11 +02:00
Yohan Boniface
06a06e9fce
Merge pull request #779 from leplatrem/patch-1 
Fix typos on Install docs
 2020-03-31 13:56:35 +02:00
Mathieu Leplatre
f5d30e9793
Fix typos on Install docs 
:)
 2020-03-31 12:58:48 +02:00
Binnette
e2ca1ecd63 Normalize keyboard shortcuts in translation 2020-03-29 20:17:00 +02:00
Binnette
c0b7d13cfb Normalize keyboard shortcuts 2020-03-28 23:59:23 +01:00
Yohan Boniface
bab49715a3 changelog 2020-03-28 11:26:07 +01:00
Yohan Boniface
82bffa43ff 1.2.2 2020-03-28 11:20:39 +01:00
Yohan Boniface
1c4e5ecbcc Bump social-auth-core 2020-03-28 11:20:18 +01:00
Binnette
170fffbe5f fix bad line break 2020-03-28 11:15:31 +01:00