Commit Graph

180 Commits

Author SHA1 Message Date
7e7f7d59a0 using mapquest leaflet sdk 2021-10-18 12:44:04 +02:00
60c7e0ef09 Merge branch 'develop' into feature/mapquest 2021-10-18 11:27:24 +02:00
93c15d8640 add Dockerfile for simple local testing
usage:
docker build -t seisobs-webapp:dev .
docker run --name seisobs-map -d -p 8080:80 seisobs-webapp:dev
2021-10-18 11:27:01 +02:00
2e5e998d8a added mapquest baselayer option
uses API key registered to https://araidne.geophysik.ruhr-uni-bochum.de/map/
2021-10-18 10:58:32 +02:00
ecdeaecfde Merge branch 'develop' into feature/mapquest 2021-10-18 10:20:37 +02:00
137b4a2761 fixing broken TopPlus baselayer 2021-10-18 10:18:21 +02:00
5989af8ce1 Merge branch 'hotfix/r20211017.2' into develop 2021-10-17 15:47:16 +02:00
a659f47a87 hotfix-20211017.2: broken default basemap
fixed borken default basemap
decrease default minMag to 0.7
2021-10-17 15:46:39 +02:00
6576b0a2b5 load mapquest leaflet scripts w/ api key 2021-10-17 15:13:17 +02:00
b585e447f0 Merge branch 'hotfix/r20211017.1' into develop 2021-10-17 15:09:02 +02:00
db1f4758f5 Merge branch 'hotfix/r20211017.1' into main 2021-10-17 15:09:02 +02:00
e5b86d34f6 hotfix: r20211017.1
add manual changes from production server, bump version
2021-10-17 15:08:42 +02:00
723ec43eee Merge remote-tracking branch 'origin/develop' into develop 2021-10-17 13:32:41 +02:00
d65abe1b08 new release 2021-10-17 13:30:12 +02:00
9c3564f9ab Merge branch 'release/r20211017' into develop 2021-10-17 13:28:50 +02:00
a23019b50f updated version strings for release r20211017 2021-10-17 13:28:19 +02:00
938452b898 renamed mkEvents.csh to fetchEvents.sh, set default values
default values:
* starttime ($1): 6 month ago if date / gdate works, today otherwise
* output file ($2): stdout
2021-10-17 13:07:26 +02:00
dc1df224cc use module logging instead of warning for messages 2021-10-16 19:27:16 +02:00
7fd109b3ea update .gitignore 2021-10-16 15:55:02 +02:00
9167804f1e make reverse geolocation lookup more stableand removed unused modules 2021-10-16 15:53:15 +02:00
9faf11d0df upgrade to python3
fixed some typos
2021-10-16 15:51:38 +02:00
844f77e8e8 update .gitignore
* add MacOS / OSX files
* ad VS code files
* removed outdated paths
2021-10-16 11:53:33 +02:00
601e92e42e replace server-side includes by jQuery get methods
* include statetment not supported with nginx
* included files can now be written in markdown
2020-07-16 16:15:59 +02:00
d09692c1d2 add markdown support
use library showdown.js
2020-07-16 13:26:20 +02:00
920439267a use cdn for sprintf.js 2020-07-16 13:25:22 +02:00
96f0f913f3 use leaflet.browserPrint instead of leaflet.easyPrint
FIXME: printing still broken.
2020-07-16 13:13:50 +02:00
25a028b5a7 using cdn for leaflet-provider.js plugin 2020-07-16 13:09:11 +02:00
9bc8c1dc21 fix easyPrint icon, printing still broken
print broken due to browser security violation (see https://github.com/rowanwins/leaflet-easyPrint/issues/82)
2020-07-16 11:20:52 +02:00
26adc34322 remove TileLayer.Grayscale.js 2020-07-15 23:34:19 +02:00
2492d44c70 switching to leaflet-providers for cleaner code and more options 2020-07-15 23:15:38 +02:00
3a0c7f6b87 Merge branch 'develop' into main 2020-07-15 22:41:24 +02:00
dacfa92970 add OpenTopoMap support 2020-07-15 22:37:39 +02:00
414d330aea updating English files 2020-07-15 18:41:07 +02:00
a26671d803 Merge branch 'feature/leaflet1.6' into develop 2020-07-15 18:36:53 +02:00
d01aa94616 move to Leaflet 1.6.0, delete obsolet (broken) baselayers
removing baselayers from komoot and mapquest
removing support for grayscale layers
2020-07-15 18:36:15 +02:00
c753510311 Merge remote-tracking branch 'origin/feature/jQuery3' into feature/jQuery3 2020-07-15 16:46:20 +02:00
2a223afbdf updating English files 2020-07-15 16:45:57 +02:00
a06477587e delete obsolete file 2020-07-15 16:45:57 +02:00
78bc392c0d using jQuery 3.51 & jQueryUI 1.12.1 2020-07-15 16:45:57 +02:00
4096dc2c66 update of jQuery to version 3.0.0 2020-07-15 16:45:57 +02:00
c2d57350fb change jquery to version 3.0.0 and adding jquery-migrate script 2020-07-15 16:44:32 +02:00
4268843fe1 updating English files 2020-07-15 16:44:09 +02:00
31779c8d64 delete obsolete file 2020-07-15 16:32:52 +02:00
81aa46a5b5 using jQuery 3.51 & jQueryUI 1.12.1 2020-07-15 14:11:06 +02:00
ca3b5731c1 update of jQuery to version 3.0.0 2020-07-15 13:57:51 +02:00
5365914033 fixing typo 2020-07-15 09:59:49 +02:00
9e4fce4b7d change jquery to version 3.0.0 and adding jquery-migrate script 2020-07-14 22:17:49 +02:00
43d809cc18 Merge branch 'release/v20200714' into main 2020-07-14 21:13:41 +02:00
74085e5e6f Merge branch 'release/v20200714' into develop 2020-07-14 21:13:41 +02:00
e3f27aac7e update copyright information 2020-07-14 21:13:15 +02:00