Commit Graph

1303 Commits

Author SHA1 Message Date
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 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' v1.1.0-beta4 2018-01-26 15:33:01 +00:00
orangemug 7e510a2582 v1.1.0-beta4 2018-01-26 15:31:33 +00:00
Orange Mug f3cb9c4fdd Merge pull request #227 from orangemug/fix/mapbox-urls
Added support for mapbox:// urls to fetchSources
2018-01-26 12:37:56 +00:00
orangemug f0f6130272 Fixed typo. 2018-01-25 19:58:01 +00:00
orangemug 0ebb299fd0 Added try/catch around mapboxUtil.normalizeSourceURL 2018-01-25 19:40:54 +00:00
orangemug 9d96525f12 Added support for mapbox:// urls. 2018-01-25 19:16:06 +00:00
Orange Mug fc6f9251f7 Merge pull request #226 from orangemug/fix/modal-safari
Fix for safari modal appearing below the overlay
2018-01-25 18:17:18 +00:00
orangemug 53cb317155 Fix for safari modal appearing below the overlay. Fixes #225 2018-01-25 08:30:23 +00:00
orangemug 4215b5808f Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6-circleci-config
Conflicts:
	package-lock.json
	src/components/inputs/AutocompleteInput.jsx
2018-01-22 09:57:54 +00:00
orangemug 2d2f9744e2 v1.1.0-beta3 v1.1.0-beta3 2018-01-22 09:13:42 +00:00
Orange Mug d0b835ee52 Merge pull request #222 from gregorywolanski/95
Source change handling bug fix (#95)
2018-01-22 08:52:28 +00:00
Grzegorz Wolański 1798305f9c Source change handling bug fix (#95) 2018-01-22 08:49:39 +01:00
Orange Mug 4b0768d0a6 Merge pull request #221 from orangemug/fix/added-guard-to-get-sources
Added guard to getSources
2018-01-21 19:08:10 +00:00
orangemug 2e79a8ff4c Added guard to getSources 2018-01-20 09:39:18 +00:00
orangemug e64ca3eb93 Added back in other jobs. 2018-01-19 18:15:46 +00:00
orangemug 094c4747d3 Update selenium/standalone-chrome to 3.8.1 2018-01-19 18:02:08 +00:00
orangemug 62f0843283 Moved back to workflows. 2018-01-19 17:55:37 +00:00
orangemug 8062e304b7 Update selenium/standalone-chrome 2018-01-19 17:51:08 +00:00
orangemug 18e7ead78a Revert to old config. 2018-01-19 17:35:19 +00:00
orangemug 3cab1dc49f Remove special directory. 2018-01-19 17:29:55 +00:00
orangemug f8dcbb8fb7 Reduce to single job. 2018-01-19 17:24:29 +00:00
orangemug c82f38c103 Multiple working directories for test versions. 2018-01-19 17:14:56 +00:00
orangemug fe0e7af033 Added multiple nodejs versions. 2018-01-19 15:13:46 +00:00
orangemug ac51902435 Added missing workflow to .circleci/config.yml 2018-01-19 15:08:45 +00:00
orangemug e0ff342702 Added yaml inheritance to .circleci/config.yml 2018-01-19 15:06:23 +00:00
orangemug 664125d820 v1.1.0-beta2 v1.1.0-beta2 2018-01-19 13:56:38 +00:00
Orange Mug 9ae2f2c5af Merge pull request #219 from orangemug/fix/autocomplete-menu-issues
Autocomplete fixes
2018-01-19 13:45:38 +00:00
orangemug 721f9b36b3 Added missing shouldItemRender to <Autocomplete/>. #219 2018-01-19 12:11:34 +00:00
orangemug a33d1b819c Autocomplete fixes #218 2018-01-19 11:58:25 +00:00
orangemug cb4f5ea963 Updated to react/react-dom v16.2.0 2018-01-18 23:15:59 +00:00
Orange Mug 3c0ebfabab Merge pull request #213 from gregorywolanski/60
Clickable layer tooltips (#60)
2018-01-18 23:03:19 +00:00
orangemug a822430e1d Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6
Conflicts:
	package-lock.json
2018-01-18 22:59:59 +00:00
Gregory Wolanski 0ba11b94c8 Merge branch 'master' into 60 2018-01-18 23:58:06 +01:00