Merge branch 'update/pleroma-fe-20190307' into 'develop'

update pleroma frontend See merge request pleroma/pleroma!910
2019-03-07 13:36:50 +00:00 · 2019-03-07 13:36:50 +00:00 · 8e9f6d8f69
commit 8e9f6d8f69
parent 992145e64c 3a097bd770
18 changed files with 22 additions and 4 deletions
--- a/priv/static/index.html
+++ b/priv/static/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>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.f8cd72107c472bb05fac426b53ec499b.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.7bce4ebd4510d2c5e6d8.js></script><script type=text/javascript src=/static/js/vendor.2a9228e5bcaf054e8060.js></script><script type=text/javascript src=/static/js/app.2a6f16b7ee4b2642dacc.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>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.6da3b5e56eb2330b1b175cca622a3d42.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.6c8fd5aa8c8c4aee99d3.js></script><script type=text/javascript src=/static/js/vendor.360be732615100da981f.js></script><script type=text/javascript src=/static/js/app.36ed651e315106252e56.js></script></body></html>
--- a/priv/static/static/css/app.6da3b5e56eb2330b1b175cca622a3d42.css
+++ b/priv/static/static/css/app.6da3b5e56eb2330b1b175cca622a3d42.css
--- a/priv/static/static/css/app.6da3b5e56eb2330b1b175cca622a3d42.css.map
+++ b/priv/static/static/css/app.6da3b5e56eb2330b1b175cca622a3d42.css.map
--- a/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css
+++ b/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css
--- a/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css.map
+++ b/priv/static/static/css/app.f8cd72107c472bb05fac426b53ec499b.css.map
--- a/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js
+++ b/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js
--- a/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js.map
+++ b/priv/static/static/js/app.2a6f16b7ee4b2642dacc.js.map
--- a/priv/static/static/js/app.36ed651e315106252e56.js
+++ b/priv/static/static/js/app.36ed651e315106252e56.js
--- a/priv/static/static/js/app.36ed651e315106252e56.js.map
+++ b/priv/static/static/js/app.36ed651e315106252e56.js.map
--- a/priv/static/static/js/manifest.6c8fd5aa8c8c4aee99d3.js
+++ b/priv/static/static/js/manifest.6c8fd5aa8c8c4aee99d3.js
--- a/priv/static/static/js/manifest.6c8fd5aa8c8c4aee99d3.js.map
+++ b/priv/static/static/js/manifest.6c8fd5aa8c8c4aee99d3.js.map
--- a/priv/static/static/js/manifest.7bce4ebd4510d2c5e6d8.js
+++ b/priv/static/static/js/manifest.7bce4ebd4510d2c5e6d8.js
--- a/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js
+++ b/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js
--- a/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js.map
+++ b/priv/static/static/js/vendor.2a9228e5bcaf054e8060.js.map
--- a/priv/static/static/js/vendor.360be732615100da981f.js
+++ b/priv/static/static/js/vendor.360be732615100da981f.js
--- a/priv/static/static/js/vendor.360be732615100da981f.js.map
+++ b/priv/static/static/js/vendor.360be732615100da981f.js.map
--- a/priv/static/static/timeago-cs.json
+++ b/priv/static/static/timeago-cs.json
@ -0,0 +1,10 @@
+[
+  "teď",
+  ["%s s", "%s s"],
+  ["%s min", "%s min"],
+  ["%s h", "%s h"],
+  ["%s d", "%s d"],
+  ["%s týd", "%s týd"],
+  ["%s měs", "%s měs"],
+  ["%s r", "%s l"]
+]
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js