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,007 Commits 4 Branches 33 Tags
012e4b670eb50552a0a90984239b6b3be99bc0c0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
orangemug 012e4b670e Updated mapbox-gl and react-sortable-hoc usage 2018-10-08 09:32:21 +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
orangemug cc51774259 1.4.0 2018-07-27 13:19:14 +01:00
orangemug 45f45b7547 Fix to prevent contents of react-codemirror being hidden 2018-07-18 08:07:35 +01:00
orangemug 6ea70ab9cf Fix what I believe to be a 'first boot' error. 2018-07-17 20:45:12 +01:00
orangemug a0e2d68dae Only apply filter if defined. 2018-07-17 20:40:23 +01:00
orangemug c0480a50ea Option to download styles with own tokens. 2018-07-15 22:51:57 +01:00
orangemug 960b2022ed Fixed map width (fixes #260) 2018-07-15 22:08:06 +01:00
orangemug 252b442ca9 The UI is 100% height so prevent bounce scroll on OSX 2018-07-15 21:51:25 +01:00
orangemug 968d7d7fda Fixed <LayerEditor/> overflow issues. 2018-07-15 13:17:47 +01:00
orangemug b211f1cd12 1.3.0 2018-07-12 15:54:01 +01:00
orangemug d88bc59720 Fixed normalizeSourceURL import issue. 2018-07-12 12:33:40 +01:00
orangemug 7c00775515 1.3.0-beta 2018-07-11 08:22:30 +01:00
orangemug 85a28999fb Initial color accessibility UI 2018-06-18 20:28:24 +01:00
orangemug afbdaecd0a Abstracted out <LoadingModal/> 2018-06-18 19:06:16 +01:00
orangemug 558f3d649d Added dialog styling. 2018-06-18 18:17:33 +01:00
orangemug df350534ce Added link to <https://maputnik.github.io/donate> 2018-06-16 09:46:30 +01:00
orangemug 7167235146 Added loading modal when opening styles. 2018-06-15 20:57:39 +01:00
orangemug cd28a53f6a Fixed failing tests, these weren't flaky tests... ooops! 2018-06-03 18:28:55 +01:00
orangemug 1fe31ac0ec Fix for bad lint error. 2018-06-03 17:55:46 +01:00
orangemug ffce8e3ba5 Added missing file. 2018-06-03 17:37:54 +01:00
orangemug 6cdb56d13f Improved showTileBoundaries and query string support 2018-06-03 17:33:08 +01:00
orangemug 0516e587b4 Added option to display tile boundries (issue #202) 2018-06-03 17:17:45 +01:00
orangemug 5b4063105b Added missing 'noopener noreferrer' 2018-06-03 16:59:41 +01:00
orangemug d9a5548762 Small bug fixes 
- Logo DOM sctrucutre now valid, no longer <a/> within </a>
 - `data-wd-key` not longer required
 - `maputnik-doc-popup` not longer hidden by LayerEditor accordion
 2018-06-03 16:37:46 +01:00
orangemug ede782abed Fixed typo. 2018-06-03 10:18:55 +01:00
orangemug 00afbad7ac Fixed lint errors. 2018-06-03 10:00:50 +01:00
orangemug 1e09066779 Merge branch 'feature/accessibility-list-reorder' into feature/shortcuts 
Conflicts:
	src/components/App.jsx
 2018-06-03 09:41:07 +01:00