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

update pleroma frontend See merge request pleroma/pleroma!451
2018-11-14 16:10:27 +00:00 · 2018-11-14 16:10:27 +00:00 · 8456675c45
parent 69d557e86d 2a75de84e1
commit 8456675c45
15 changed files with 15 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><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>
+<!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.35cf9744b80c38efa9fa.js></script><script type=text/javascript src=/static/js/vendor.7e4a5b87ce584522089d.js></script><script type=text/javascript src=/static/js/app.a65abd01bcd13a691048.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -12,5 +12,6 @@
  "formattingOptionsEnabled": false,
  "collapseMessageWithSubject": false,
  "hidePostStats": false,
-  "hideUserStats": false
+  "hideUserStats": false,
+  "loginMethod": "password"
 }
--- 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.a65abd01bcd13a691048.js
+++ b/priv/static/static/js/app.a65abd01bcd13a691048.js
--- a/priv/static/static/js/app.a65abd01bcd13a691048.js.map
+++ b/priv/static/static/js/app.a65abd01bcd13a691048.js.map
--- a/priv/static/static/js/manifest.0acc0743ff1587a4dde3.js
+++ b/priv/static/static/js/manifest.0acc0743ff1587a4dde3.js
--- a/priv/static/static/js/manifest.35cf9744b80c38efa9fa.js
+++ b/priv/static/static/js/manifest.35cf9744b80c38efa9fa.js
--- a/priv/static/static/js/manifest.35cf9744b80c38efa9fa.js.map
+++ b/priv/static/static/js/manifest.35cf9744b80c38efa9fa.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.7e4a5b87ce584522089d.js
+++ b/priv/static/static/js/vendor.7e4a5b87ce584522089d.js
--- a/priv/static/static/js/vendor.7e4a5b87ce584522089d.js.map
+++ b/priv/static/static/js/vendor.7e4a5b87ce584522089d.js.map
--- a/priv/static/static/timeago-ga.json
+++ b/priv/static/static/timeago-ga.json
@ -0,0 +1,10 @@
+[
+  "Anois",
+  ["%s s", "%s s"],
+  ["%s n", "%s nóimeád"],
+  ["%s u", "%s uair"],
+  ["%s l", "%s lá"],
+  ["%s se", "%s seachtaine"],
+  ["%s m", "%s mí"],
+  ["%s b", "%s bliainta"]
+]
--- a/priv/static/static/timeago-oc.json
+++ b/priv/static/static/timeago-oc.json
@ -3,8 +3,8 @@
  ["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 jorn",   "fa %s jorns"],
  ["fa %s setm.", "fa %s setm."],
  ["fa %s mes",   "fa %s meses"],
-  ["fa %s any",   "fa %s ans"]
+  ["fa %s an",   "fa %s ans"]
 ]