988 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
orangemug	855771a6b6	npm is getting confused about the lockfile. This now works locally from fresh install	2018-10-06 15:13:25 +01:00
orangemug	b711168e44	Move package-lock.json fixes... :/	2018-10-06 15:00:34 +01:00
orangemug	158153e366	Revert package-lock.json update and build against node:10	2018-10-06 14:42:33 +01:00
orangemug	6b890d162a	Merge remote-tracking branch 'upstream/master' into feature/ol-experimental-support	2018-10-06 14:06:10 +01:00
Orange Mug	e6d2a6d5ff	Merge pull request #384 from orangemug/feature/os-open-zoomstack ... OS Open Zoomstack	2018-10-06 13:25:23 +01:00
Orange Mug	c8a004422f	Merge pull request #406 from emuanalytics/bug/#380 ... Fix for Issue #380	2018-10-06 13:18:31 +01:00
Orange Mug	df457fc7bf	Merge pull request #407 from pathmapper/get-name ... Get name from package.json	2018-10-04 18:15:42 +01:00
pathmapper	6e03f1f077	get name from package.json	2018-10-04 16:42:39 +02:00
Robin Summerhill	4c13350c14	Issue #380 - fix for data functions	2018-10-03 20:11:53 +01:00
Orange Mug	63a2495c68	Merge pull request #405 from pathmapper/update-tilehosting ... Update tilehosting URL	2018-10-01 21:21:24 +01:00
pathmapper	f9de73e18a	Update tilehosting URL	2018-10-01 10:13:00 +02:00
Orange Mug	e6e2be61f0	Merge pull request #398 from orangemug/fix/load-url-error ... Show error if style fails to load and disabled button if input is empty	2018-09-26 18:35:51 +01:00
Gregory Wolanski	060f7aa42c	Merge pull request #400 from orangemug/feature/make-layer-visibility-always-shown ... Make layer visibility icon shown when hidden	2018-09-24 22:19:07 +02:00
orangemug	8b0ae178b8	Added in thumbnails	2018-09-24 21:17:41 +01:00
orangemug	6b94e9b78b	Merge remote-tracking branch 'upstream/master' into feature/os-open-zoomstack ... Conflicts: src/config/styles.json	2018-09-24 21:14:55 +01:00
orangemug	b171bf3127	Fixes for code review comments.	2018-09-24 21:01:37 +01:00
orangemug	0c6a179cec	Switch to using styleUrl for disabling button	2018-09-24 20:58:43 +01:00
Orange Mug	aa50785c12	Merge pull request #399 from orangemug/fix/added-default-prop ... Added default isActive prop to Collapse component	2018-09-24 20:44:04 +01:00
orangemug	252403b1e3	Added classBlockModifier to <LayerAction/> and switched to only displaying icons for hidden layers	2018-09-24 20:40:51 +01:00
orangemug	bc1d0de057	Added default isActive prop to Collapse component	2018-09-24 16:55:53 +01:00
orangemug	4a0b9fd0de	Added missing prop type	2018-09-24 15:13:35 +01:00
orangemug	e8777e1857	Updated package-lock.json	2018-09-24 15:10:00 +01:00
orangemug	94a2a16330	Updated ol* versions	2018-09-24 14:51:25 +01:00
orangemug	004d135d93	Show error if style fails to load and disabled button if input is empty	2018-09-24 14:41:09 +01:00
orangemug	0973dcee8a	Added back in experimental OpenLayers support	2018-09-24 14:05:53 +01:00
Orange Mug	c908f7dcd0	Merge pull request #394 from orangemug/fix/request-abort-and-oerlapping-modals ... Fix overlapping modals & request canceling	2018-09-23 22:28:39 +01:00
orangemug	b7fd889fcd	Removed signal from fetch as not supported in all browsers.	2018-09-23 21:00:17 +01:00
orangemug	35600c253d	Revert react-aria-modal	2018-09-23 20:43:34 +01:00
orangemug	673465af77	Use AbortController in activeRequest	2018-09-23 19:53:32 +01:00
orangemug	cc5d0dc4fe	Merge remote-tracking branch 'upstream/master' into fix/request-abort-and-oerlapping-modals	2018-09-23 19:45:47 +01:00
orangemug	e6da977c48	Prevented overlapping modals in react tree and fixed request canceling.	2018-09-23 19:40:50 +01:00
orangemug	cdcf16196c	Merge remote-tracking branch 'upstream/master' into feature/make-layer-visibility-always-shown ... Conflicts: src/components/layers/LayerListItem.jsx	2018-09-23 09:07:02 +01:00
orangemug	a0ed6a379b	Always show layer visibility toggle in layer list	2018-09-23 09:05:08 +01:00
Orange Mug	7ffb44f604	Merge pull request #391 from orangemug/maintenance/remove-mapbox-for-now ... Remove mapbox for the time being	2018-09-22 18:28:00 +01:00
Orange Mug	225d0388ce	Merge pull request #386 from orangemug/fix/showTileBoundaries-error ... Added guard to map object	2018-09-22 16:15:00 +01:00
Orange Mug	0468db8cc2	Merge pull request #390 from orangemug/fix/switch-visibility-icons ... Switch visibility icons	2018-09-22 15:51:10 +01:00
Orange Mug	695f612110	Merge pull request #389 from orangemug/maintenance/remove-travis ... Remove travis CI	2018-09-22 15:50:49 +01:00
Orange Mug	9c07852b87	Merge pull request #388 from orangemug/fix/glyph-key-replace ... Fix glyph key replace	2018-09-22 15:50:12 +01:00
orangemug	9ef198fb86	Merge remote-tracking branch 'upstream/master' into maintenance/remove-mapbox-for-now	2018-09-22 14:19:44 +01:00
orangemug	fd34e31462	Merge remote-tracking branch 'upstream/master' into fix/showTileBoundaries-error	2018-09-22 14:17:16 +01:00
orangemug	8eb49427fd	Merge remote-tracking branch 'upstream/master' into fix/switch-visibility-icons	2018-09-22 14:15:43 +01:00
orangemug	ebafb3c3dd	Merge remote-tracking branch 'upstream/master' into maintenance/remove-travis	2018-09-22 14:14:12 +01:00
orangemug	09c6154949	Merge remote-tracking branch 'upstream/master' into fix/glyph-key-replace	2018-09-22 14:12:39 +01:00
Orange Mug	53c8661cd3	Merge pull request #358 from orangemug/fix/remove-componentWillUpdate ... Remove UNSAFE_componentWillReceiveProps	2018-09-22 14:11:58 +01:00
orangemug	3d5eec897e	Try moving to 'Visual Studio 2017' image	2018-09-22 13:44:41 +01:00
orangemug	3763ec3737	Remove mapbox until we have a valid access token.	2018-09-22 13:18:52 +01:00
orangemug	f1216795d2	Swap layer visibility icons.	2018-09-22 13:12:36 +01:00
orangemug	0ac70df00f	Remove travis as we now have CircleCI.	2018-09-22 13:06:56 +01:00
orangemug	7d0a985f1d	Only replace glyphs key if a replacement exists.	2018-09-22 13:04:12 +01:00
orangemug	c5ff67b6e0	Appveyor nodejs -v6 +v10	2018-09-22 12:50:40 +01:00