Commit graph

735 commits

Author SHA1 Message Date
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
orangemug
dbe2c2637e Better onPrepare for wdio 2018-04-09 10:20:37 +01: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
Orange Mug
2a7ef82d23
Merge pull request #248 from orangemug/feature/nsp
Added nsp (node security project)
2018-02-03 15:41:42 +00:00
orangemug
95168f22e3 Added nsp 2018-02-03 15:30:29 +00:00
Orange Mug
4360753263
Merge pull request #242 from orangemug/feature/update-mapbox-gl-v0.44.0
Updated mapbox-gl 0.43.0 -> 0.44.0
2018-02-03 14:02:45 +00:00
Orange Mug
ad491cb465
Merge pull request #240 from orangemug/fix/do-not-expose-fallback-tokens
Do not expose fallback tokens during export
2018-02-03 14:02:06 +00:00
orangemug
e5bed80c96 Updated mapbox-gl 0.43.0 -> 0.44.0. Fixes #237 2018-02-02 18:04:57 +00:00
orangemug
9bf3046d4c Public/private gists added. Fixes #238
Gists are now private by default with a option for public.
2018-02-02 17:23:21 +00:00
Orange Mug
da8dc0f7a6
Merge pull request #231 from justenPalmer/issues
Issue 229: Adding a style without Glyphs defined throws an exception with no feedback in interface
2018-02-02 16:43:18 +00:00
orangemug
b66a4afd28 Do not expose fallback tokens during export. Fixes #230 2018-02-02 15:33:15 +00:00
Orange Mug
a94c53534c
Merge pull request #235 from orangemug/feature/export-token-fix
Fixes for export to add in mapbox access token
2018-02-02 11:47:41 +00:00
Orange Mug
6b22c9130f
Merge pull request #236 from orangemug/fix/issue-234
Added guard in fetchSources
2018-02-02 11:24:23 +00:00
orangemug
7d5927bbc8 Added additional guard
As checking the key name is 'openmaptiles' isn't a guarantee
2018-02-01 22:00:26 +00:00
jPalmer
240d02a124 Merge branch 'master' of https://github.com/maputnik/editor into issues 2018-02-01 13:44:23 -08:00
jPalmer
92ef1c4cbb added more robust handling of glyphs in styles - addresses #229 2018-02-01 13:44:15 -08:00
orangemug
5ce57d0803 Added guard in fetchSources.
This will mean that autocomplete is broken for sources without vector_layers key present.
2018-02-01 21:37:17 +00:00
orangemug
1c134d757c Fixes for export to add in mapbox access token. 2018-02-01 19:54:44 +00:00
Orange Mug
32d808b230
Merge pull request #233 from orangemug/feature/version-in-ui
Added version number to the UI
2018-02-01 08:10:21 +00:00
orangemug
ee3def492a Fixed toolbar version position. 2018-01-31 21:36:47 +00:00
orangemug
41bd91fcd2 Center the toolbar button text. 2018-01-31 21:22:12 +00:00
orangemug
02c8542848 Added version number to the UI. Fixes #232 2018-01-31 21:04:49 +00:00
jPalmer
844abd38ce added missing glyphs property check on styleChanged - addresses #229 2018-01-31 11:28:09 -08:00
jPalmer
d9b6f28bb5 added missing glyphs property check on styleChanged - addresses #229 2018-01-31 11:26:10 -08:00
orangemug
ed85b838ec v1.1.0 2018-01-30 20:57:24 +00:00
Orange Mug
f82b138a3d
Merge pull request #228 from orangemug/fix/source-layer-guard
Added guard to <LayerSourceLayerBlock/> sourceLayerIds
2018-01-30 17:49:41 +00:00
orangemug
89c38991b9 Added guard to <LayerSourceLayerBlock/> sourceLayerIds 2018-01-29 17:18:30 +00:00
orangemug
0e4c06cc3e Merge remote-tracking branch 'origin/master' 2018-01-26 15:33:01 +00:00