Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'

PleromaFE bundle dropping requirement for embedded account relationships See merge request pleroma/pleroma!2494
2020-05-09 15:30:39 +00:00 · 2020-05-09 15:30:39 +00:00 · d73e8b6b12
parent 5e1d994785 0e1bda55e8
commit d73e8b6b12
20 changed files with 9 additions and 1 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,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1588419330867.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.8aa781e6dd81307f544b.js></script><script type=text/javascript src=/static/js/app.fa89b90e606f4facd209.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/vendors~app.18fea621d430000acc27.css rel=stylesheet><link href=/static/css/app.613cef07981cd95ccceb.css rel=stylesheet><link href=/static/fontello.1588947937982.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.561a1c605d1dfb0e6f74.js></script><script type=text/javascript src=/static/js/app.996428ccaaaa7f28cb8d.js></script></body></html>
--- a/priv/static/static/font/fontello.1588419330867.woff
+++ b/priv/static/static/font/fontello.1588419330867.woff
--- a/priv/static/static/font/fontello.1588419330867.woff2
+++ b/priv/static/static/font/fontello.1588419330867.woff2
--- a/priv/static/static/font/fontello.1588947937982.eot
+++ b/priv/static/static/font/fontello.1588947937982.eot
--- a/priv/static/static/font/fontello.1588947937982.svg
+++ b/priv/static/static/font/fontello.1588947937982.svg
@ -114,6 +114,8 @@

 <glyph glyph-name="thumbs-up-alt" unicode="&#xf164;" d="M143 107q0 15-11 25t-25 11q-15 0-25-11t-11-25q0-15 11-25t25-11q15 0 25 11t11 25z m89 286v-357q0-15-10-25t-26-11h-160q-15 0-25 11t-11 25v357q0 14 11 25t25 10h160q15 0 26-10t10-25z m661 0q0-48-31-83 9-25 9-43 1-42-24-76 9-31 0-66-9-31-31-52 5-62-27-101-36-43-110-44h-72q-37 0-80 9t-68 16-67 22q-69 24-88 25-15 0-25 11t-11 25v357q0 14 10 25t24 11q13 1 42 33t57 67q38 49 56 67 10 10 17 27t10 27 8 34q4 22 7 34t11 29 19 28q10 11 25 11 25 0 46-6t33-15 22-22 14-25 7-28 2-25 1-22q0-21-6-43t-10-33-16-31q-1-4-5-10t-6-13-5-13h155q43 0 75-32t32-75z" horiz-adv-x="928.6" />

+<glyph glyph-name="share" unicode="&#xf1e0;" d="M679 286q74 0 126-53t52-126-52-126-126-53-127 53-52 126q0 7 1 19l-201 100q-51-48-121-48-75 0-127 53t-52 126 52 126 127 53q70 0 121-48l201 100q-1 12-1 19 0 74 52 126t127 53 126-53 52-126-52-126-126-53q-71 0-122 48l-201-100q1-12 1-19t-1-19l201-100q51 48 122 48z" horiz-adv-x="857.1" />
+
 <glyph glyph-name="binoculars" unicode="&#xf1e5;" d="M393 678v-428q0-15-11-25t-25-11v-321q0-15-10-25t-26-11h-285q-15 0-25 11t-11 25v285l139 488q4 12 17 12h237z m178 0v-392h-142v392h142z m429-500v-285q0-15-11-25t-25-11h-285q-15 0-25 11t-11 25v321q-15 0-25 11t-11 25v428h237q13 0 17-12z m-589 661v-125h-197v125q0 8 5 13t13 5h161q8 0 13-5t5-13z m375 0v-125h-197v125q0 8 5 13t13 5h161q8 0 13-5t5-13z" horiz-adv-x="1000" />

 <glyph glyph-name="user-plus" unicode="&#xf234;" d="M393 357q-89 0-152 63t-62 151 62 152 152 63 151-63 63-152-63-151-151-63z m536-71h196q7 0 13-6t5-12v-107q0-8-5-13t-13-5h-196v-197q0-7-6-12t-12-6h-107q-8 0-13 6t-5 12v197h-197q-7 0-12 5t-6 13v107q0 7 6 12t12 6h197v196q0 7 5 13t13 5h107q7 0 12-5t6-13v-196z m-411-125q0-29 21-51t50-21h143v-133q-38-28-95-28h-488q-67 0-108 39t-41 106q0 30 2 58t8 61 15 60 24 55 34 45 48 30 62 11q11 0 22-10 44-34 86-51t92-17 92 17 86 51q11 10 22 10 73 0 121-54h-125q-29 0-50-21t-21-50v-107z" horiz-adv-x="1142.9" />
--- a/priv/static/static/font/fontello.1588947937982.ttf
+++ b/priv/static/static/font/fontello.1588947937982.ttf
--- a/priv/static/static/font/fontello.1588947937982.woff
+++ b/priv/static/static/font/fontello.1588947937982.woff
--- a/priv/static/static/font/fontello.1588947937982.woff2
+++ b/priv/static/static/font/fontello.1588947937982.woff2
--- a/priv/static/static/fontello.1588947937982.css
+++ b/priv/static/static/fontello.1588947937982.css
--- a/priv/static/static/fontello.json
+++ b/priv/static/static/fontello.json
@ -346,6 +346,12 @@
      "code": 59427,
      "src": "fontawesome"
    },
+    {
+      "uid": "4aad6bb50b02c18508aae9cbe14e784e",
+      "css": "share",
+      "code": 61920,
+      "src": "fontawesome"
+    },
    {
      "uid": "8b80d36d4ef43889db10bc1f0dc9a862",
      "css": "user",
--- a/priv/static/static/js/2.18e4adec273c4ce867a8.js
+++ b/priv/static/static/js/2.18e4adec273c4ce867a8.js
--- a/priv/static/static/js/2.18e4adec273c4ce867a8.js.map
+++ b/priv/static/static/js/2.18e4adec273c4ce867a8.js.map
--- a/priv/static/static/js/app.996428ccaaaa7f28cb8d.js
+++ b/priv/static/static/js/app.996428ccaaaa7f28cb8d.js
--- a/priv/static/static/js/app.996428ccaaaa7f28cb8d.js.map
+++ b/priv/static/static/js/app.996428ccaaaa7f28cb8d.js.map
--- a/priv/static/static/js/app.fa89b90e606f4facd209.js
+++ b/priv/static/static/js/app.fa89b90e606f4facd209.js
--- a/priv/static/static/js/app.fa89b90e606f4facd209.js.map
+++ b/priv/static/static/js/app.fa89b90e606f4facd209.js.map
--- a/priv/static/static/js/vendors~app.561a1c605d1dfb0e6f74.js
+++ b/priv/static/static/js/vendors~app.561a1c605d1dfb0e6f74.js
--- a/priv/static/static/js/vendors~app.561a1c605d1dfb0e6f74.js.map
+++ b/priv/static/static/js/vendors~app.561a1c605d1dfb0e6f74.js.map
--- a/priv/static/static/js/vendors~app.8aa781e6dd81307f544b.js.map
+++ b/priv/static/static/js/vendors~app.8aa781e6dd81307f544b.js.map
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js