Commit graph

1416 commits

Author SHA1 Message Date
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
Orange Mug
90024c5ec7
Merge pull request #408 from orangemug/maintenance/update-deps-2018-10-06
Updated dependencies
2018-10-10 15:15:26 +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
Orange Mug
a666f86be0
Merge pull request #397 from orangemug/feature/ol-experimental-support
Added back in experimental OpenLayers support
2018-10-06 16:59:13 +01:00
Orange Mug
44fad76d45
Merge pull request #392 from orangemug/feature/color-accessibility-ui
Color accessibility UI
2018-10-06 16:58:32 +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
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