Commit graph

760 commits

Author SHA1 Message Date
orangemug
7a60df370e Changed url to be local (although not used) 2018-04-10 14:20:13 +01:00
orangemug
aee4a041fe Removed node:10 from appveyor 2018-04-10 14:03:09 +01:00
orangemug
6fa06e5483 Removed un-useful comments 2018-04-10 14:02:36 +01:00
orangemug
15962481ee Disable OSX until we get a open source plan for maputnik/editor 2018-04-10 13:35:02 +01:00
orangemug
6bf695cd4b Removed linux from travis. CircleCI now takes care of that 2018-04-10 13:34:20 +01:00
orangemug
7ecbc14c39 Added OSX build to tests. 2018-04-10 13:29:48 +01:00
orangemug
fb0e531f4a Removed node:10 as it doesn't exist yet. 2018-04-10 13:17:59 +01:00
orangemug
bd44e6d071 Fixed typo. 2018-04-10 13:11:42 +01:00
orangemug
3ae37f1c46 Updated appveyor to no longer test, only build/lint 2018-04-10 13:08:55 +01:00
orangemug
8c7a1f7075 Updated build config for circleci to only test webdriver in one job 2018-04-10 13:05:58 +01:00
orangemug
3e97d8a5f1 Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8 2018-04-10 12:56:43 +01:00
orangemug
6138257a89 Remove logging. 2018-04-10 12:52:59 +01:00
orangemug
0bd62985b9 Revert change to undo/redo 2018-04-10 12:45:44 +01:00
orangemug
a346d757fd Don't assume docker for mac. 2018-04-09 18:18:15 +01:00
orangemug
84f3970730 Updated selenium-standalone & webdriverio 2018-04-09 17:51:12 +01:00
orangemug
050e22918a Fix for running within docker. 2018-04-09 17:49:56 +01:00
Orange Mug
f205776695
Merge pull request #277 from maputnik/revert-275-maintenance/update-ol-mapbox-style
Revert "Update ol-mapbox-style ^2.10.1 -> ^2.11.2"
2018-04-09 13:54:12 +01:00
Orange Mug
4d427bcbc3
Revert "Update ol-mapbox-style ^2.10.1 -> ^2.11.2" 2018-04-09 13:53:25 +01:00
Orange Mug
0b4910e3c3
Merge pull request #275 from orangemug/maintenance/update-ol-mapbox-style
Update ol-mapbox-style ^2.10.1 -> ^2.11.2
2018-04-09 12:16:48 +01:00
orangemug
11a59debdf Update ol-mapbox-style ^2.10.1 -> ^2.11.2 2018-04-09 11:10:46 +01:00
orangemug
dbe2c2637e Better onPrepare for wdio 2018-04-09 10:20:37 +01:00
Orange Mug
d6ce13c356
Merge pull request #273 from cmarqu/patch-1
Fix small typo.
2018-04-09 09:42:46 +01:00
Orange Mug
6d094a8b3e
Merge pull request #271 from ziveo/master
Adding mac keyboard bindings
2018-04-09 09:37:32 +01:00
Colin Marquardt
4d0456fd68
Fix small typo. 2018-03-27 00:45:42 +02:00
ziveo
ad83f940a7
Merge branch 'master' into master 2018-03-18 20:02:20 -04:00
ziveo
edc7e02f58
Merge pull request #2 from ziveo/develop__mac-keyboard-bindings
Improving keyboard bindings code
2018-03-16 23:01:34 -04:00
Bojan Zivkovic
7dfc5029a3 Improving keyboard bindings code 2018-03-16 23:00:33 -04:00
ziveo
8e02722b52
Merge pull request #1 from ziveo/develop__mac-keyboard-bindings
Adding mac keyboard bindings
2018-03-15 23:41:48 -04:00
Bojan Zivkovic
984581e01a Adding mac keyboard bindings 2018-03-15 23:39:32 -04:00
orangemug
1de7ba7e86 Use dev settings for test. 2018-03-06 21:11:58 +00:00
orangemug
a3fa86f7ee Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v7
Conflicts:
	config/webpack.production.config.js
	package-lock.json
	package.json
2018-03-06 07:22:26 +00:00
Orange Mug
a589f89c4c
Merge pull request #268 from orangemug/fix/update-mapbox-gl-inspect
Updated mapbox-gl-inspect to v1.3.0
2018-02-19 09:40:53 +00:00
orangemug
3b599aed4c Updated mapbox-gl-inspect to v1.3.0 2018-02-19 08:28:08 +00:00
Orange Mug
6953db74c6
Merge pull request #266 from orangemug/maintenance/added-circle-symbol-pitch-alignment-paint-props
Added [symbol|circle]-pitch-alignment props
2018-02-18 17:59:13 +00:00
Orange Mug
1ad473a539
Merge pull request #267 from orangemug/feature/heatmap
Added heatmap layer support
2018-02-18 16:34:42 +00:00
orangemug
fafda9ec92 Merge remote-tracking branch 'upstream/master' into maintenance/added-circle-symbol-pitch-alignment-paint-props 2018-02-18 15:00:22 +00:00
Orange Mug
11b85bf565
Merge pull request #263 from orangemug/feature/hillshading
Added hillshading support
2018-02-18 14:53:58 +00:00
orangemug
6ecc6670dc Added [symbol|circle]-pitch-alignment paint props 2018-02-18 13:23:04 +00:00
orangemug
553f0fe23e Drop support for 'heatmap-color'
See <https://github.com/maputnik/editor/issues/265#issuecomment-366511333>
2018-02-18 12:07:34 +00:00
orangemug
77ddf67201 Added heatmap layer type. 2018-02-18 11:50:04 +00:00
orangemug
a092bc2689 Moved to using orangemug/mapbox-gl-inspect#fix/only-vector-sources
While <https://github.com/lukasmartinelli/mapbox-gl-inspect/pull/11> is
waiting to be merged/released.
2018-02-18 11:22:01 +00:00
orangemug
38e0786463 Added missing hillshade / raster-dem guards. 2018-02-17 07:45:24 +00:00
orangemug
180b17d315 Fixed typo raster -> raster-dem 2018-02-16 20:34:50 +00:00
orangemug
8acbd784a0 Added hillshading support. 2018-02-16 19:52:19 +00:00
Orange Mug
07efe1e1b8
Merge pull request #253 from orangemug/maintenance/openlayers-update
Updated openlayers
2018-02-07 22:56:01 +00:00
orangemug
7ea53cc3a1 Increased build timeout. 2018-02-07 11:38:32 +00:00
orangemug
de21eea21b Some modules aren't ES5 so we much compile them 2018-02-07 11:00:24 +00:00
orangemug
8f8ed6dff3 Changed to uglifyjs-webpack-plugin for es2015 support. 2018-02-06 10:50:15 +00:00
orangemug
8915bbfeb4 Updated openlayers.
openlayers^4.4.2 -> ol^4.6.4
ol-mapbox-style^1.0.1 -> ol-mapbox-style^2.10.1

Fixes #246
2018-02-06 08:28:57 +00:00
Orange Mug
df3a42acce
Merge pull request #241 from orangemug/feature/private-public-gist
Public/private gists
2018-02-03 15:43:12 +00:00