Commit graph

818 commits

Author SHA1 Message Date
Yohan Boniface
abc1f119d5 black on views.py 2023-02-27 11:38:59 +01:00
Yohan Boniface
122e9de3a3 Use ipdb with pytest --pdb 2023-02-27 11:01:01 +01:00
Yohan Boniface
3aa34d124e black on views.py 2023-02-27 11:00:33 +01:00
Yohan Boniface
97e2df0a8d Prevent caching datalayer's data for owners/editors
cf #1038
2023-02-25 22:17:10 +01:00
Yohan Boniface
2bd4008f97 Use Nginx ETag algo
There is a situation where the ETag can be generated by Nginx,
but then used by Django: when the user starts editing a layer,
the js client will send the ETag received from Nginx to uMap
as value to check is there is an editing conflict.
2023-02-25 21:50:39 +01:00
Yohan Boniface
a8dee3fa07 Add Vary: Accept-Encoding header 2023-02-23 11:17:19 +01:00
Yohan Boniface
0300a5f962 ETag must be between double quotes per spec 2023-02-23 11:10:44 +01:00
Yohan Boniface
cfcb83dbfb black on urls.py 2023-02-23 11:10:24 +01:00
Yohan Boniface
e60227f7da
Merge pull request #1041 from k-3st3ban/master
New asked features: checkbox filters, permanent credits, and caption menus options
2023-02-23 10:28:53 +01:00
3st3ban3
eed12fdf87 Update wording to avoid confusion for data checkboxes 2023-02-22 17:36:22 +01:00
Yohan Boniface
2fc30b117b Prepare for Django 4.x 2023-02-22 15:19:38 +01:00
Yohan Boniface
96a194e1f4 i18n 2023-02-22 15:18:56 +01:00
Yohan Boniface
bd1dd4e233 i18n 2023-02-22 10:23:03 +01:00
3st3ban3
6d900ac79f Show filters menu only if filter keys are defined 2023-02-18 10:13:12 +01:00
3st3ban3
ce17f8dfe0 Fix undefined error without refreshing page after creating advanced filters 2023-02-15 18:46:20 +01:00
3st3ban3
2221806b7e Update permanent credits alignement and shape 2023-02-13 17:33:50 +01:00
3st3ban3
ced62d8eed Fix controls errors with permanent credits 2023-01-22 00:28:56 +01:00
3st3ban3
423084e9ea Interface option to hide caption menus 2023-01-14 23:15:27 +01:00
3st3ban3
57ba42061c Permanent credits feature in the bottom left corner 2023-01-14 22:48:16 +01:00
3st3ban3
d69f965f79 Filters checkboxes using features' properties 2023-01-14 22:31:39 +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
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