ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-10-11 21:43:44 +00:00
Code Issues Projects Releases Wiki Activity
1,155 Commits 4 Branches 33 Tags
7cf01f0c12c1db8e4be6237b585fa55db7cd21d3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
orangemug 7cf01f0c12 Merge remote-tracking branch 'upstream/master' into feature/issue-433 2019-05-18 17:33:31 +01:00
orangemug 1e87765f95 Tidy and added fallback (exception) color. 2019-05-18 17:29:59 +01:00
orangemug b712e7f184 Merge remote-tracking branch 'upstream/master' into feature/layer-list-ui-handle 
Conflicts:
	src/styles/_layer.scss
 2018-11-02 17:57:42 +00:00
orangemug e9b5bfb572 Remove old code. 2018-11-02 08:34:56 +00:00
orangemug 5de5281b49 Prevent title resize. 2018-11-01 18:26:21 +00:00
orangemug deec7894dd Make the whole layer label draggable 2018-11-01 08:12:40 +00:00
orangemug c8e548e3be Increase more-menu icon size, broken by react-icons update 2018-10-31 08:19:12 +00:00
orangemug 82d3c934c8 Merge remote-tracking branch 'upstream/master' into fix/lock-logo-size-in-survey-popup 2018-10-30 20:26:17 +00:00
orangemug f2f0270936 Use KeyboardEvent.key rather than keyCode in attempt to support more keyboard layouts. 2018-10-30 20:12:48 +00:00
orangemug 1f81449e3c Added a visible drag handle. 2018-10-30 19:32:20 +00:00
orangemug 48ebca6236 Fix the size of the logo in the survey modal so it doesn't cause a visual jump when it loads. 2018-10-29 13:12:01 +00:00
orangemug bce8e8b807 Shortcut fixes 
- Allow shortcuts to trigger from the shortcut modal
 - Fix inspect/map toggle shortcut
 2018-10-29 13:07:49 +00:00
orangemug cf6c6f1c17 Fixes for 'mapboxgl-popup-tip' border color. 2018-10-27 14:41:50 +01:00
orangemug c6163b6ba2 Added missing css for popup changes 2018-10-27 14:14:20 +01:00
orangemug 7121a680b4 Add missing prop type 2018-10-27 14:08:23 +01:00
orangemug cf391031f0 Added color swatch to <FeatureLayerPopup/> 2018-10-27 14:04:13 +01:00
orangemug 7495c0dfcf Added support for 'fill-extrusion-vertical-gradient' and 'symbol-z-order' 
Also updated @mapbox/mapbox-gl-style-spec
 2018-10-22 22:29:23 +01:00
orangemug 218ce148d5 Delay modal close until blur events have triggered. 2018-10-19 08:39:07 +01:00
orangemug 588b18d10e Only render strings in the autocomplete menu. 
Expression objects were making there way into this menu which was crashing the editor.
 2018-10-11 21:39:52 +01:00
orangemug 889005de6c Set default value of autocomplete shouldItemRender value param as sometimes it's undefined 2018-10-09 21:11:47 +01:00
orangemug 843d3df8bc Fixed react-icons size/position. 2018-10-09 20:58:14 +01:00
orangemug 825b9044b9 Tidy naming. 2018-10-09 20:48:10 +01:00
orangemug 92a1be83b6 Moved babel config back out into .babelrc 
This is due to .babelrc being used for other tooling.
 2018-10-09 20:45:03 +01:00
orangemug 36e35eb208 Tidy webpack configs. 2018-10-09 20:43:35 +01:00
orangemug 2fcdb47fe5 Moved babel config, removed uglifyJs and decorators plugins 2018-10-09 20:14:16 +01:00
orangemug 012e4b670e Updated mapbox-gl and react-sortable-hoc usage 2018-10-08 09:32:21 +01:00
orangemug 492cc244d8 Added hacks to fix styling issue 
See <https://github.com/maputnik/editor/pull/392#issuecomment-427595172>
 2018-10-06 22:14:59 +01:00
orangemug d17d6b43c0 Fixed merge issue. 2018-10-06 21:57:24 +01:00
orangemug 1bf10cd6d6 Merge remote-tracking branch 'upstream/master' into maintenance/update-deps-2018-10-06 
Conflicts:
	src/components/App.jsx
	src/components/Toolbar.jsx
 2018-10-06 21:39:26 +01:00
orangemug b0cd9140be Updated remaining deps. 2018-10-06 21:21:42 +01:00
orangemug cc6196969f Updated lockfile 2018-10-06 21:07:48 +01:00
orangemug 802a7eb1be Updated babel/webpack 2018-10-06 21:05:33 +01:00
orangemug c8d23a534e Updated some dev deps 2018-10-06 16:44:23 +01:00
orangemug cf3650c8cd Updated react-icons 2018-10-06 16:38:08 +01:00
orangemug 1a8349f821 Updated deps with no API changes. 2018-10-06 16:01:34 +01:00
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 4134919dde Added missing key attribute to <option/> 2018-10-06 14:44:12 +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
orangemug 1525807d06 setValue -> selectByValue 2018-10-06 13:59:50 +01:00
orangemug a356bfd601 Switch from react-aria-menubutton to <select/> 2018-10-06 13:54:02 +01: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
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
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 e4aa016713 Fixed lint errors 2018-09-23 14:50:29 +01:00
orangemug 8b67499a64 Removed external svg from filter command. 2018-09-23 14:48:19 +01:00
orangemug bcdc7c6811 Improved color accessibility UI 2018-09-23 14:39:02 +01:00
orangemug 8f07a79a49 Merge remote-tracking branch 'upstream/master' into feature/color-accessibility-ui 
Conflicts:
	src/components/App.jsx
	src/styles/_components.scss
 2018-09-23 11:39:15 +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
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
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
orangemug db6b9ac176 Added OS Open Zoomstack and styles 2018-09-20 19:26:53 +01:00
orangemug 77475af3c6 Added guard to map object 2018-09-20 19:16:23 +01:00
orangemug 00b22eb902 OpenLayers removed in previous PR. 2018-09-10 15:11:06 +01:00
orangemug be954143c3 Switch to setTimeout(fn, 0) 2018-09-10 15:09:34 +01:00
orangemug b314642586 Rollback to setImmediate 2018-09-10 14:55:45 +01:00
orangemug b5fc315b37 setImmediate -> process.nextTick 2018-09-10 14:51:22 +01:00
orangemug 26ff9f63bb Merge remote-tracking branch 'upstream/master' into fix/remove-componentWillUpdate 
Conflicts:
	src/components/map/MapboxGlMap.jsx
	src/components/modals/ExportModal.jsx
 2018-09-10 14:46:52 +01:00
orangemug b966fae926 1.5.0 2018-09-10 13:18:21 +01:00
orangemug f1ddf4e57e 1.5.0-beta3 2018-09-03 21:17:50 +01:00
orangemug 1e07a88aed Updated regex to tilehosting.com, partial revert of #367 2018-09-03 21:02:38 +01:00
orangemug 6e49cc65a9 1.5.0-beta2 2018-09-03 20:37:16 +01:00
orangemug f0e4b5b930 1.5.0-beta 2018-09-01 11:09:19 +01:00
orangemug 6207416b32 Added no WebGL error message to MapboxGL map component 2018-08-22 22:05:46 +01:00
orangemug f0202241f4 Remove old base64 loader. 2018-08-22 18:51:58 +01:00
orangemug 0e8c94af1e Remove logging. 2018-08-22 18:51:42 +01:00
orangemug 922ee616ec Reduce bundle size 
- Use the browsers fetch rather than the request module
 - base64-loader -> raw-loader
 - Remove ol3 because it's been broken for a while
 - Removed old GitHub gist support as it's no longer functional
 - Removed Mousetrap as we were only using a small part of the functionality
 - Moved to single js file to make things simplier
 2018-08-22 09:36:34 +01:00
orangemug 70f1f9ffac Added 'show-collision-boxes' query parameter 2018-08-19 17:32:18 +01:00
orangemug 409f81f0d8 More componentWillUpdate transition fixes. 2018-08-07 20:13:45 +01:00
orangemug 1aa90bef37 Removed componentWillUpdate 2018-08-06 22:27:03 +01:00
orangemug bdc6489db4 Disable survey in test runner, which was making the tests fail. 2018-08-01 20:59:42 +01:00
orangemug 03e52b7a72 Added support for 'raster-resampling' 2018-08-01 20:34:26 +01:00
orangemug 551e950c39 Updated mapbox dependencies 2018-08-01 20:33:33 +01:00
orangemug a7620f83a6 Fixed broken token replacer function. 2018-07-28 16:36:01 +01:00
orangemug 0384181ee1 Added final bits for thunderforest integration 2018-07-27 16:25:53 +01:00
orangemug fd59f42819 Merge remote-tracking branch 'upstream/master' into feature/add-thunderforest-source 
Conflicts:
	src/components/App.jsx
 2018-07-27 15:43:02 +01:00