Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend See merge request pleroma/pleroma!396

Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend See merge request pleroma/pleroma!396
310a4bc2 · kaniini · 44762daf · 72a88043 · 310a4bc2 · 310a4bc2
Commit 310a4bc2 authored Oct 26, 2018 by kaniini
--- a/priv/static/index.html
+++ b/priv/static/index.html
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><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.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.0a010c91e43b948ff1a3.js></script><script type=text/javascript src=/static/js/vendor.865340b21f539d34e2e1.js></script><script type=text/javascript src=/static/js/app.d429b9c3b1c1f499710c.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><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.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.0acc0743ff1587a4dde3.js></script><script type=text/javascript src=/static/js/vendor.26ecdac76eb1b8aebbe9.js></script><script type=text/javascript src=/static/js/app.36f6378df4aa596c1419.js></script></body></html>
\ No newline at end of file
--- a/priv/static/static/js/app.36f6378df4aa596c1419.js
+++ b/priv/static/static/js/app.36f6378df4aa596c1419.js
--- a/priv/static/static/js/app.36f6378df4aa596c1419.js.map
+++ b/priv/static/static/js/app.36f6378df4aa596c1419.js.map
--- a/priv/static/static/js/app.d429b9c3b1c1f499710c.js
+++ b/priv/static/static/js/app.d429b9c3b1c1f499710c.js
--- a/priv/static/static/js/app.d429b9c3b1c1f499710c.js.map
+++ b/priv/static/static/js/app.d429b9c3b1c1f499710c.js.map
--- a/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js
+++ b/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js
--- a/priv/static/static/js/manifest.0acc0743ff1587a4dde3.js
+++ b/priv/static/static/js/manifest.0acc0743ff1587a4dde3.js
--- a/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js.map
+++ b/priv/static/static/js/manifest.0a010c91e43b948ff1a3.js.map
--- a/priv/static/static/js/vendor.26ecdac76eb1b8aebbe9.js
+++ b/priv/static/static/js/vendor.26ecdac76eb1b8aebbe9.js
--- a/priv/static/static/js/vendor.26ecdac76eb1b8aebbe9.js.map
+++ b/priv/static/static/js/vendor.26ecdac76eb1b8aebbe9.js.map
--- a/priv/static/static/js/vendor.865340b21f539d34e2e1.js
+++ b/priv/static/static/js/vendor.865340b21f539d34e2e1.js
--- a/priv/static/static/js/vendor.865340b21f539d34e2e1.js.map
+++ b/priv/static/static/js/vendor.865340b21f539d34e2e1.js.map
--- a/priv/static/static/timeago-ca.json
+++ b/priv/static/static/timeago-ca.json
+[
+  "ara mateix",
+  ["fa %s s",     "fa %s s"],
+  ["fa %s min",   "fa %s min"],
+  ["fa %s h",     "fa %s h"],
+  ["fa %s dia",   "fa %s dies"],
+  ["fa %s setm.", "fa %s setm."],
+  ["fa %s mes",   "fa %s mesos"],
+  ["fa %s any",   "fa %s anys"]
+]
--- a/priv/static/static/timeago-oc.json
+++ b/priv/static/static/timeago-oc.json
+[
+  "ara meteis",
+  ["fa %s s",     "fa %s s"],
+  ["fa %s min",   "fa %s min"],
+  ["fa %s h",     "fa %s h"],
+  ["fa %s dia",   "fa %s jorns"],
+  ["fa %s setm.", "fa %s setm."],
+  ["fa %s mes",   "fa %s meses"],
+  ["fa %s any",   "fa %s ans"]
+]