Commit graph

1714 commits

Author SHA1 Message Date
Binnette
89ba015746
Merge pull request #748 from Binnette/remove-protocol-from-iframe-code
Remove protocol from iframe src url
2020-02-21 22:16:12 +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
cca6041061
Merge pull request #715 from gislars/patch-1
Update ubuntu from scratch doc
2019-11-20 09:19:49 +01:00
Lars Lingner
90c7b38114
Update ubuntu from scratch doc
I had to add a config for /static and /uploads folder in nginx when I set DEBUG = False
2019-10-08 10:06:30 +02:00
Yohan Boniface
3ccc6de68b psycopg2==2.8.2 2019-05-11 13:13:47 +02: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
661ce80941 1.1.1 2019-04-16 20:37:40 +02:00
Yohan Boniface
8aa811c416 Add site/* in .gitignore (data from mkdocs) 2019-04-16 20:34:59 +02:00
Yohan Boniface
701bcdd300 i18n 2019-04-16 20:34:22 +02:00
Yohan Boniface
7f3a8258b3 Downgrade psycopg2 to 2.7.7
Django is not ready yet (migrations fail).

cf https://docs.djangoproject.com/en/dev/releases/2.2.1/

Expected May 1, 2019
2019-04-16 20:32:48 +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
12ffd0f0f1 Remove old reference to submodules 2019-04-09 09:59:09 +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
1628e5c43a Bump dev deps 2019-04-07 14:13:50 +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
00ed913909 Travis: use xenial to try to fix gdal install 2019-04-07 13:47:33 +02:00
Yohan Boniface
a9d19a153c Fixing gdal installation on Travis 2019-04-07 12:41:30 +02:00
Yohan Boniface
b4740a317c Reset gdal travis config 2019-04-07 12:11:52 +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
bbd239e07d Bump deps 2019-04-07 11:39:12 +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
367e0ba8a8
Merge pull request #669 from brylie/patch-1
Change 'cured' to 'improved'
2019-02-13 11:27:21 +01:00
Brylie Christopher Oxley
e7fce1873d
Change 'cured' to 'improved'
From the context, I think it was implied that OpenStreetMap is *improved* by community adoption, rather than being 'cured' of some 'sickness' :-)
2019-02-13 12:09:00 +02:00
Yohan Boniface
508b63fce5 Merge branch 'master' of github.com:umap-project/umap 2019-02-09 17:29:39 +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
eb3d115a96 bump deps 2019-02-06 19:38:19 +01:00
Yohan Boniface
7b37f28264 i18n 2019-02-01 14:49:32 +01:00