Commit graph

809 commits

Author SHA1 Message Date
Duvel
96e2c94e2d
Install tini with package manager to allow arm64 2022-11-27 17:01:08 +01:00
Duvel
c6677ce0c8
Copy statement didn't work in build container 2022-11-27 16:25:04 +01:00
Duvel
4f98297c99
Removed suspended phantomjs and allows for arm64 2022-11-27 16:23:47 +01:00
Duvel
2deb5597fd
Use latest Node JS LTS 2022-11-27 16:21:26 +01:00
Duvel
af8fc0ad54
Merge branch 'umap-project:master' into master 2022-11-27 15:25:00 +01:00
Yohan Boniface
9b0986c16b
Merge pull request #1031 from aleksejspopovs/use-locatecontrol
Use Leaflet.Locate instead of a custom locate control
2022-11-24 21:50:01 +01:00
Aleksejs Popovs
4155dd27d0 Switch to an actually unused class name 2022-11-24 15:38:23 -05:00
Yohan Boniface
41b68ab7b4
Merge pull request #1032 from aleksejspopovs/avoid-django4
Declare incompatibility with Django 4
2022-11-24 21:12:32 +01:00
Aleksejs Popovs
5d2709b055 Declare incompatibility with Django 4 2022-11-24 14:37:50 -05:00
Aleksejs Popovs
7f4f5b460a Delete custom locate control 2022-11-24 14:27:41 -05:00
Aleksejs Popovs
864abf9f46 Replace custom locate control with Leaflet.Locate 2022-11-24 14:26:49 -05:00
Aleksejs Popovs
c4415e1e99 Vendor leaflet.locatecontrol 2022-11-24 13:55:09 -05:00
Yohan Boniface
12c4ce6147
Merge pull request #1021 from k-3st3ban/master
vendors files information in contributing.md
2022-10-26 18:52:06 +02:00
Esteban
21a972f64c
vendors files information in contributing.md 2022-10-26 18:48:14 +02:00
Duvel
0cfd7c647b
Prevent not displaying error 2022-10-15 17:00:02 +02:00
Duvel
f2df2dd9c2
Requirements.txt has been removed 2022-10-15 16:17:34 +02:00
Duvel
27d47a8e56
Merge branch 'umap-project:master' into master 2022-10-15 15:09:48 +02:00
Duvel
022ac18102
Remove erroring line for man 2022-10-15 15:09:09 +02:00
Yohan Boniface
567fbbd464
Merge pull request #987 from mattcen/patch-1
Update table names in Search/Optimisation docs
2022-09-08 19:17:01 +02:00
Matthew Cengia
5dcdab19b1
Update table names in Search/Optimisation docs 2022-03-22 14:58:56 +11:00
Yohan Boniface
ab675f13bb chore: remove requirements files 2021-12-30 12:13:29 +01:00
Yohan Boniface
3df1da1887 chore: upgrade pillow, psycopg and requests 2021-12-30 12:07:04 +01:00
Yohan Boniface
7dc608a242 fix: fix version import from context processors 2021-12-30 12:06:41 +01:00
Yohan Boniface
77b8390184 chore: remove mkdocs warning about "pages" replaced by "nav" 2021-12-30 12:01:59 +01:00
Yohan Boniface
c5dc2fa13a chore: bump dev requirements 2021-12-30 11:59:01 +01:00
Yohan Boniface
cc14796c6c chore: use setup.cfg 2021-12-30 11:16:00 +01:00
Yohan Boniface
b7009e3ed0 Init empty permissions
Fix bug where we coud not edit permissions of a new saved map unless
reloading the page.
2021-12-29 17:35:15 +01:00
Yohan Boniface
3b22155013
Merge pull request #955 from umap-project/dependabot/pip/django-3.2.5
Bump django from 3.2.4 to 3.2.5
2021-12-29 17:33:13 +01:00
Yohan Boniface
52394c3e2a
Merge pull request #971 from tordans/patch-1
CSS: Fix cut of text in table of popup content
2021-12-29 17:32:13 +01:00
Tobias
00890aabde
CSS: Fix cut of text in iframes of popup content
The overflow hidden removed in 72f8fd971d did cut of iframes and their content. However, it did introduce a scrollbar when the iframe is too big. Which is fixed here by adding a max-width of 100%.

There was a max-width but one with fixed pixel values before, which was removed in 345283782c (diff-5470058378896897263b7a99e4226772660e09d5e9e51b530fffc6075b8e07bfL1299). 

The stylesheet-style's max-width will overwrite any width-specification given via the width-attribute on the iframe as well as width-conditions set as inline-styles. However, adding a inline max-width-style will overwrite the css-file specification due to higher css specificity.
2021-12-29 14:17:22 +01:00
Tobias
b3ad642a06
CSS: Fix cut of text popup content
The overflow that was removed in 72f8fd971d did cut off long URLs and such which where now visible overflowing the popup content. However, we do want the visible but using `break-word`.
2021-12-28 21:29:31 +01:00
Tobias
72f8fd971d
CSS: Fix cut of text in table of popup content
Whenever the key or value is too long, the table was pushed being wider than the given container. And the overflow rules cut off the content of the table.

Fixes
- Remove overflow rules (reset to defaults, which is `auto`), which makes a scroll bar show up if content is too wide
- Let long text break in lines instead of pushing the table (which in turn prevents the scroll bar from showing up)
2021-12-22 14:47:22 +01:00
dependabot[bot]
f3870272de
Bump django from 3.2.4 to 3.2.5
Bumps [django](https://github.com/django/django) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.4...3.2.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-22 17:41:48 +00:00
Yohan Boniface
4a3d4ae7a7 Use correct JSONField 2021-09-16 12:17:08 +02:00
Yohan Boniface
91cfc39cb6 Make Django with DEFAULT_AUTO_FIELD setting 2021-09-16 12:15:18 +02:00
Yohan Boniface
c244716e0d social-auth-app-django==5.0.0 2021-09-16 12:12:42 +02:00
Yohan Boniface
4c9e82f6ab Remove grunt 2021-09-16 11:54:57 +02:00
Yohan Boniface
e0bcd07d4b chore: i18n 2021-09-16 11:54:03 +02:00
Yohan Boniface
aad1a002ac
Merge pull request #946 from umap-project/dependabot/pip/pillow-8.3.2
Bump pillow from 8.0.1 to 8.3.2
2021-09-16 11:52:57 +02:00
Yohan Boniface
7cf984411a
Merge pull request #950 from umap-project/dependabot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
2021-09-16 11:52:29 +02:00
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