Merge remote-tracking branch 'upstream/master' into drag-drop-map

terrestris · Mar 26, 2018 · 0c2d5a8 · 0c2d5a8
2 parents abac3d6 + 8ba5bd3
commit 0c2d5a8
Show file tree

Hide file tree

Showing 40 changed files with 1,434 additions and 19,524 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -41,6 +41,7 @@
         "ClassDeclaration": true,
         "ArrowFunctionExpression": true
       }
-    }]
+    }],
+    "space-infix-ops": ["error", {"int32Hint": false}]
   }
 }
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,10 @@
 language: node_js
 node_js:
 - "8"
-before_install:
-- npm install -g greenkeeper-lockfile@1
 before_script:
 - npm install --no-save ol@~4 react@~16
-- greenkeeper-lockfile-update
 script:
 - npm run build
-after_script:
-- greenkeeper-lockfile-upload
 after_success:
 - npm run-script coveralls
 - "./.ci/update-gh-pages.sh > /dev/null 2>&1"

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,4 +14,4 @@
         "internalConsoleOptions": "neverOpen"
       }
     ]
-  }
+  }
diff --git a/README.md b/README.md
@@ -23,6 +23,10 @@ You can find a complete [Feature List](https://github.com/terrestris/react-geo/w
 
 Visit https://terrestris.github.io/react-geo/
 
+## Workshop
+
+Visit https://terrestris.github.io/react-geo-ws
+
 ## Installation
 
     npm i @terrestris/react-geo
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ @@
             "internalConsoleOptions": "neverOpen"
           }
         ]
-      }
+      }