Merge pull request #1128 from Kinto/upgrade-kinto-admin

Upgrade kinto-admin to 1.10.0
Kinto · Mar 3, 2017 · 3443f16 · 3443f16
2 parents 69f823f + 765017e
commit 3443f16
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 39 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -40,7 +40,7 @@ Protocol is now at version **1.15**. See `API changelog`_.
   and endpoint type (#1047).
 - Move generic API schemas (e.g TimeStamps and HeaderFields) from `kinto.core.resource.schema`
   to a sepate file on `kinto.core.schema`. (#1054)
-- Upgraded the kinto-admin to version 1.9.0 (#1086)
+- Upgraded the kinto-admin to version 1.10.0 (#1086, #1128)
 - Upgrade to Pyramid 1.8 (#1087)
 - Replace old loadtests with functional tests (#1085)
 - Use `Cornice Swagger <https://github.com/Cornices/cornice.ext.swagger>`_ rather than

diff --git a/kinto/plugins/admin/__init__.py b/kinto/plugins/admin/__init__.py
@@ -9,7 +9,7 @@ def includeme(config):
     # Expose capability.
     config.add_api_capability(
         "admin",
-        version="1.9.0",
+        version="1.10.0",
         description="Serves the admin console.",
         url="https://github.com/Kinto/kinto-admin/",
     )

diff --git a/kinto/plugins/admin/build/asset-manifest.json b/kinto/plugins/admin/build/asset-manifest.json
@@ -1,8 +1,8 @@
 {
-  "main.css": "static/css/main.25233047.css",
-  "main.css.map": "static/css/main.25233047.css.map",
-  "main.js": "static/js/main.973075d6.js",
-  "main.js.map": "static/js/main.973075d6.js.map",
+  "main.css": "static/css/main.9e6c0b5e.css",
+  "main.css.map": "static/css/main.9e6c0b5e.css.map",
+  "main.js": "static/js/main.af904059.js",
+  "main.js.map": "static/js/main.af904059.js.map",
   "static/media/glyphicons-halflings-regular.eot": "static/media/glyphicons-halflings-regular.f4769f9b.eot",
   "static/media/glyphicons-halflings-regular.svg": "static/media/glyphicons-halflings-regular.89889688.svg",
   "static/media/glyphicons-halflings-regular.ttf": "static/media/glyphicons-halflings-regular.e18bbf61.ttf",

diff --git a/kinto/plugins/admin/build/index.html b/kinto/plugins/admin/build/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Kinto Web Administration</title><link href="/v1/admin/static/css/main.25233047.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/v1/admin/static/js/main.973075d6.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Kinto Web Administration</title><link href="/v1/admin/static/css/main.9e6c0b5e.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/v1/admin/static/js/main.af904059.js"></script></body></html>
diff --git a/.../admin/build/static/css/main.25233047.css → .../admin/build/static/css/main.9e6c0b5e.css b/.../admin/build/static/css/main.25233047.css → .../admin/build/static/css/main.9e6c0b5e.css
diff --git a/...in/build/static/css/main.25233047.css.map → ...in/build/static/css/main.9e6c0b5e.css.map b/...in/build/static/css/main.25233047.css.map → ...in/build/static/css/main.9e6c0b5e.css.map
diff --git a/kinto/plugins/admin/build/static/js/main.973075d6.js b/kinto/plugins/admin/build/static/js/main.973075d6.js
diff --git a/kinto/plugins/admin/build/static/js/main.973075d6.js.map b/kinto/plugins/admin/build/static/js/main.973075d6.js.map
diff --git a/kinto/plugins/admin/build/static/js/main.af904059.js b/kinto/plugins/admin/build/static/js/main.af904059.js
diff --git a/kinto/plugins/admin/build/static/js/main.af904059.js.map b/kinto/plugins/admin/build/static/js/main.af904059.js.map
diff --git a/kinto/plugins/admin/package.json b/kinto/plugins/admin/package.json
@@ -7,7 +7,7 @@
     "react-scripts": "0.7.0"
   },
   "dependencies": {
-    "kinto-admin": "1.9.0",
+    "kinto-admin": "1.10.0",
     "react": "^15.3.2",
     "react-dom": "^15.3.2"
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Kinto Web Administration</title><link href="/v1/admin/static/css/main.25233047.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/v1/admin/static/js/main.973075d6.js"></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Kinto Web Administration</title><link href="/v1/admin/static/css/main.9e6c0b5e.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/v1/admin/static/js/main.af904059.js"></script></body></html>