almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-05-01 04:22:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
937 commits 67 branches 145 tags 69 MiB
Commit graph

608 commits

Author SHA1 Message Date
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
Aleksejs Popovs
4155dd27d0 Switch to an actually unused class name 2022-11-24 15:38:23 -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
7dc608a242 fix: fix version import from context processors 2021-12-30 12:06:41 +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
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
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
e0bcd07d4b chore: i18n 2021-09-16 11:54:03 +02:00
Ansgar Hegerfeld
d080c118b6 Fix German typo 2021-09-15 21:43:07 +02: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
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
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
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
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
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
82bffa43ff 1.2.2 2020-03-28 11:20:39 +01:00
Binnette
170fffbe5f fix bad line break 2020-03-28 11:15:31 +01:00
Yohan Boniface
3fa3473908 1.2.1 2020-03-25 15:14:19 +01:00
Yohan Boniface
2ba7a057f3 Be more liberal about username regex in URL 
fix #774
 2020-03-25 15:11:11 +01:00
Yohan Boniface
4358a35a5d Set dir=rtl when appropriate 
cf #752
 2020-03-23 11:30:45 +01:00
Yohan Boniface
ebc3b90d40 1.2.0 2020-03-23 08:39:21 +01:00
Yohan Boniface
7f0454fce0 Use new settings of social-auth 
cf #754
 2020-03-22 18:00:47 +01:00
Yohan Boniface
f7972b47a4 TableEditor: prevent adding properties with "." 
fix #426
 2020-03-22 15:57:05 +01:00
Yohan Boniface
24baed0c1a Prevent old style slideshow to be actived on load 
We used to only consider the delay to define if the slideshow was
active or not.
 2020-03-22 15:40:52 +01:00
Yohan Boniface
27a4fd7dc2 i18n 2020-03-22 15:32:02 +01:00
Yohan Boniface
382212990e Update user message 2020-03-22 15:24:05 +01:00
Yohan Boniface
c18dd863ce Rename onceDatalayersDataLoaded to onceDataLoaded 2020-03-22 14:38:45 +01:00
Yohan Boniface
ccf2c1b4fe Feature permalink 
fix #497
fix #294
 2020-03-22 14:36:34 +01:00
Yohan Boniface
2090550d26 i18n 2020-03-22 14:08:51 +01:00
Yohan Boniface
a9f43de43a
Merge pull request #766 from umap-project/geolocate 
Add a blinking marker on user position on geolocate
 2020-03-22 14:03:56 +01:00
Yohan Boniface
08b065a16a Remove blinking to geolocation marker 2020-03-22 13:43:21 +01:00
Yohan Boniface
d5a3c6eb63 Change arrow direction when "more control" is active 
fix #485
 2020-03-21 18:38:48 +01:00
Yohan Boniface
85abb4b57e Add a blinking marker on user position on geolocate 
fix #339
 2020-03-21 18:16:37 +01:00
Yohan Boniface
01c1acf0b3 Allow variables in tooltips 
fix #737
 2020-03-19 07:37:54 +01:00
Yohan Boniface
8c160abb76 Fix Utils tests following iframe HTML change 
cf #765
 2020-03-18 14:55:54 +01:00
Yohan Boniface
db33222609
Merge pull request #765 from umap-project/panel-iframe 
Adapt iframe and image width when in right panel
 2020-03-18 07:37:07 +01:00
Binnette
345283782c Remove iframes max-width;Add div wrapper around iframes;Adapt popup height to content with flexbox 2020-03-18 00:34:54 +01:00
Yohan Boniface
9e4fb82b12 i18n 2020-03-17 22:01:30 +01:00
Yohan Boniface
f86dca9ac1 Adapt iframe and image width when in right panel 
fix #184
 2020-03-17 19:39:14 +01:00
Yohan Boniface
8c6f500419 Set icon img max-height 
fix #143
 2020-03-17 19:21:50 +01:00
Yohan Boniface
f8187c0d20 i18n 2020-03-10 18:41:05 +01:00
Yohan Boniface
8e7d09f12a Add missing .mo files 2020-03-09 17:55:11 +01:00
Yohan Boniface
8b65a12383 i18n: add "sv" (Swedish) 2020-03-09 17:25:45 +01:00
Yohan Boniface
03cc738056 i18n: Add "et" (Estonian) 2020-03-09 17:24:07 +01:00
Yohan Boniface
be809acbc6 i18n: add "no" 2020-03-09 17:19:16 +01:00
Yohan Boniface
401cb6db6e
Merge pull request #761 from umap-project/si-lk 
Add "si" to LANG_INFO
 2020-03-09 17:16:08 +01:00
Yohan Boniface
4000da1d41
Merge pull request #754 from Binnette/sync-username-on-connect 
Update username with value from OAuth provider
 2020-03-09 17:06:00 +01:00
Yohan Boniface
4a43b870c1 Add "si" to LANG_INFO 
cf https://github.com/django/django/blob/master/django/conf/locale/__init__.py#L10

"get_language_info_list" would not run otherwise.
 2020-03-09 16:22:51 +01:00
Yohan Boniface
ab122d6de2 i18n 2020-03-09 16:20:33 +01:00
Binnette
d68c1c2553
Translation update 
* Update all translations
* Add: ar, ast, he, id, is, pt-br, pt-pt, si-lk, sr, th-th, tr
* Remove: pt (replaced by pt-pt and pt-br)
 2020-03-03 19:46:10 +01:00
Binnette
b0e06fccfe add comment and change pipeline method name 2020-03-01 11:11:27 +01:00
Binnette
179e8c7e97 Update username with value from OAuth provider 2020-03-01 00:12:10 +01:00
Binnette
6625f16702 Remove protocol from iframe src url 
Note that baseUrl is only used for iframe src url, nothing else
 2020-02-20 21:33:50 +01:00
Yohan Boniface
a6414af1eb 1.1.2 2019-05-11 13:10:57 +02:00
Yohan Boniface
6236e37652 Add ko i18n 2019-05-11 11:32:33 +02:00
Yohan Boniface
42f3f14521 Merge branch 'master' of github.com:umap-project/umap 2019-05-11 11:21:48 +02:00
Yohan Boniface
96cebada15
Merge pull request #688 from jridky/patch-1 
Translation update
 2019-05-11 11:18:23 +02:00
Yohan Boniface
e31d3c2ce2 Update zh_TW 2019-05-11 11:12:37 +02:00
Yohan Boniface
70a760489e Fix parsing iframe when text contain two iframes 
cf #689
 2019-05-11 11:10:03 +02:00
Josef Řídký
1bb173b8cc
Update cs_CZ.js 2019-05-03 11:55:55 +02:00
Josef Řídký
3cfeb1df7e
Update CZ translation 2019-05-03 11:39:39 +02:00
Yohan Boniface
0b2f9b5c12 1.1.1 (for real) 2019-04-16 20:41:02 +02:00
Yohan Boniface
701bcdd300 i18n 2019-04-16 20:34:22 +02:00
Yohan Boniface
8972505f1b Add missing migration for Map.share_status update 2019-04-16 20:30:42 +02:00
Yohan Boniface
95a16b2aaf Set unique map id per page in map_list 
This words around the issue where a map is displayed twice while
loading more maps in the home page because while loading maps some
have been updated
 2019-04-09 11:47:02 +02:00
Yohan Boniface
7d9ae731c0 Allow to filter maps by share_status in admin 
fix #682
 2019-04-09 10:20:30 +02:00
Yohan Boniface
0d2b82333a i18n 2019-04-07 16:33:34 +02:00
Yohan Boniface
99699c787d
Merge pull request #674 from ward/english-string-fixes 
Fix original English translation strings
 2019-04-07 16:27:57 +02:00
Yohan Boniface
2e56957672 1.1.0 2019-04-07 14:58:22 +02:00
Yohan Boniface
462e7a8a0f Try to upgrade Postgis on travis 2019-04-07 14:05:56 +02:00
Yohan Boniface
17db76d003 Specify Postgis version in settings for Travis 2019-04-07 13:59:00 +02:00
Yohan Boniface
d9be546c9f Use autocompletefields for owner and editors in admin 2019-04-07 11:51:12 +02:00
Yohan Boniface
560ace68f8 Allow to search maps in the admin 2019-04-07 11:43:16 +02:00
Yohan Boniface
8f775faf73 Bump django to 2.2 2019-04-07 11:39:03 +02:00
Yohan Boniface
b02b610117 i18n 2019-04-07 11:22:08 +02:00
Yohan Boniface
5b8a8904cc Add Map.BLOCKED share status 2019-04-07 11:12:38 +02:00
Yohan Boniface
7e38a08fb8 Switch from DictField to JSONField 2019-04-07 10:40:30 +02:00
Ward Muylaert
2ffdd0594b Fix original English translation strings 
It seems mistakes in the original English (en) translation strings are
not fixed in the website despite them being correct for en_US in
Transifex for several years. My guess is that they are the default for
en, so unless you somehow manage to explicitly select en_US (which does
not seem possible), you are stuck with the incorrect English.
 2019-02-25 14:06:57 +01:00
Yohan Boniface
addc67549e frameborder lower case 
fix #670
 2019-02-22 21:56:17 +01:00
Yohan Boniface
95ded1101a i18n 
fix #672
 2019-02-22 21:49:41 +01:00
Yohan Boniface
ff482aedc8 Fix unknown var since 887a9fc7 2019-02-22 21:49:41 +01:00
Yohan Boniface
5177068de4 Mention in documentation that theme.css is loaded by default 2019-02-09 11:31:31 +01:00
Yohan Boniface
eec9e094bc 1.0.0 2019-02-09 10:53:45 +01:00
Yohan Boniface
2cc7e01a39 1.0.0-rc.9 2019-02-06 19:41:36 +01:00
Yohan Boniface
7b37f28264 i18n 2019-02-01 14:49:32 +01:00
Yohan Boniface
7a49dcba99 Increase limit in owner maps page 
fix #651
 2019-01-30 12:07:35 +01:00
Yohan Boniface
a4c0b31fc9 Expose original map URI in full export 
fix #659
 2019-01-30 11:34:59 +01:00
Yohan Boniface
f6b2469566 i18n 
fix #665
 2019-01-30 11:23:57 +01:00
Yohan Boniface
41ed5b4163 Fix edge case in name display in data browser 2019-01-30 11:08:17 +01:00
Yohan Boniface
2d54ad7f0f it i18n 
o
 2018-11-17 19:21:43 +01:00
Yohan Boniface
966b136b5c i18n 2018-11-08 22:23:56 +01:00
Yohan Boniface
adb7f40c64 i18n 2018-11-04 21:25:49 +01:00
Yohan Boniface
9f11f6cd2d 1.0.0-rc.8 2018-11-04 21:20:29 +01:00
Yohan Boniface
58fb544083 Fix missing remote datalayers when display data browser on load 
Another option would have been to wait for onceDataloaded instead
of onceLoaded, but then the panel would never be displayed if some
layer fails to load (eg. a 429 on Overpass).

fix #509
 2018-11-04 21:12:09 +01:00
Yohan Boniface
ca0c8c421e Show each visible layer in the caption 
Not only the browsable ones (eg. we want to have a heatmap in there)
 2018-11-04 21:05:21 +01:00
Yohan Boniface
bdbaef123c 1.0.0-rc.7 2018-10-13 14:22:40 +02:00
Yohan Boniface
fcd9a0eef1 Table popup should inherit BaseWithTitle 
fix #647
 2018-10-13 14:19:42 +02:00
Yohan Boniface
a421698a60 Pull el i18n 2018-10-13 14:06:16 +02:00
Yohan Boniface
a64d918d80 i18n 2018-10-02 23:28:22 +02:00
Yohan Boniface
bf8fb1d3c8 1.0.0-rc.6 2018-09-23 12:02:32 +02:00
Yohan Boniface
4c8d1c3826 de i18n 2018-09-23 12:02:23 +02:00
Yohan Boniface
90aba2ed15 Remove context parameter from DictField.from_db_value (RemovedInDjango30Warning) 2018-09-23 11:56:25 +02:00
Yohan Boniface
706967d982 Keep python 3.5 compat for now 2018-09-23 11:02:36 +02:00
Yohan Boniface
f3ecc8ce28 Update permissions metadata at each map save 
This fix the issue where the permissions panel was not available
on first save (without reloading the page).
 2018-09-23 09:57:00 +02:00
Yohan Boniface
e1844483d7 Always force flatProperties in osmtogeojson call 
fix #641

See https://github.com/tyrasd/osmtogeojson/issues/100
 2018-09-22 07:33:00 +02:00
Yohan Boniface
81830f8f7b 1.0.0-rc.5 2018-09-11 20:08:07 +02:00
Yohan Boniface
d041001168 fixed ternary choice dealing with unknown values (fix #633) 2018-09-11 20:06:35 +02:00
Yohan Boniface
b72650fafe Fix user autocompletion in permissions panel (fix #635) 2018-09-11 19:56:45 +02:00
Yohan Boniface
b54f4efce5 1.0.0-rc.4 2018-09-10 22:42:59 +02:00
Yohan Boniface
a03aa4860d Fix dark button hover (cf #586) 2018-09-10 12:58:15 +02:00
Yohan Boniface
6dc3181ed9 Fix umap alert close link CSS targeting 2018-09-10 12:50:03 +02:00
Yohan Boniface
17afb5c47d Fix label on hover not working (fix #631) 2018-09-10 12:43:39 +02:00
Yohan Boniface
c5ca7e5d73 Change Map.center.widget SRID to 4326 as it should be 
By default, a PointField uses a OpenLayersWidget, which forces the
SRID to 3857 when casting geojson (no idea why, given geojson SRID
is 4326).
 2018-09-08 22:42:11 +02:00
Yohan Boniface
709387d985 i18n 2018-09-08 17:09:10 +02:00
Yohan Boniface
0798b708a8 1.0.0-rc.3 2018-09-08 17:07:54 +02:00
Yohan Boniface
fb85a6c93c i18n 2018-09-08 17:01:22 +02:00
Yohan Boniface
da4ee13deb Display a message on the site when trying to do a POST in readonly mode 2018-09-08 16:49:25 +02:00
Yohan Boniface
4c446998e7 Fix control hover color (fix #586) 2018-09-07 22:49:06 +02:00
Yohan Boniface
7941e8fa60 Add a readonly mode 
Activable with UMAP_READONLY=True
 2018-09-07 22:12:39 +02:00
Yohan Boniface
3537670221 1.0.0-rc.2 2018-09-05 22:31:01 +02:00
Yohan Boniface
08ff6e53a3 Update Leaflet to 1.3.4 2018-09-05 21:35:16 +02:00
Yohan Boniface
2d9fd3ed46 pull translations 2018-09-05 20:15:11 +02:00
Yohan Boniface
a0fb623661 Remove deprecated use of L.Mixin.Events 2018-08-30 09:38:59 +02:00
Yohan Boniface
01fa7543a2 Pass a binded function to zoomToSeeLayer MarkerCluster function 
fix #611
 2018-08-17 09:30:18 +02:00