Merge branch 'master' into dev

l-pa · Apr 21, 2020 · afd2b84 · afd2b84
2 parents fa3bcd6 + 7f44795
commit afd2b84
Show file tree

Hide file tree

Showing 22 changed files with 1,242 additions and 273 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "iwanthue": "^1.3.0",
+    "iwanthue": "^1.4.0",
     "pegjs": "^0.10.0",
     "react": "^16.10.2",
     "react-color": "^2.17.3",

diff --git a/public/index.html b/public/index.html
@@ -13,7 +13,10 @@
 
     <script src="%PUBLIC_URL%/libs/sigma.min.js"></script>
     <script src="%PUBLIC_URL%/libs/plugins/sigma.parsers.json.min.js"></script>
-    <script src="%PUBLIC_URL%/libs/plugins/sigma.parsers.gexf.min.js"></script>
+    <!-- <script src="%PUBLIC_URL%/libs/plugins/sigma.parsers.gexf.min.js"></script> -->
+    <script src="%PUBLIC_URL%/libs/plugins/gexf-parser.js"></script>
+    <script src="%PUBLIC_URL%/libs/plugins/sigma.parsers.gexf.js"></script>
+
     <script src="%PUBLIC_URL%/libs/plugins/sigma.layout.forceAtlas2.min.js"></script>
     <script src="%PUBLIC_URL%/libs/plugins/sigma.plugins.dragNodes.min.js"></script>
     <script src="%PUBLIC_URL%/libs/plugins/sigma.exporters.json.js"></script>