Merge branch 'bump-fe-2020-07-10' into 'develop'

Update frontend See merge request pleroma/pleroma!2747
2020-07-10 09:45:10 +00:00 · 2020-07-10 09:45:10 +00:00 · 8aa7143f46
parent 31a0ed5d01 328062308a
commit 8aa7143f46
101 changed files with 11 additions and 3 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/app.493b9b5acee37ba97824.css rel=stylesheet><link href=/static/fontello.1594134783339.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.8837fb59589d1dd6acda.js></script><script type=text/javascript src=/static/js/app.53001fa190f37cf2743e.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/app.77b1644622e3bae24b6b.css rel=stylesheet><link href=/static/fontello.1594374054351.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.247dc52c7abe6a0dab87.js></script><script type=text/javascript src=/static/js/app.1e68e208590653dab5aa.js></script></body></html>
--- a/priv/static/static/css/app.493b9b5acee37ba97824.css.map
+++ b/priv/static/static/css/app.493b9b5acee37ba97824.css.map
--- a/priv/static/static/css/app.77b1644622e3bae24b6b.css
+++ b/priv/static/static/css/app.77b1644622e3bae24b6b.css
--- a/priv/static/static/css/app.77b1644622e3bae24b6b.css.map
+++ b/priv/static/static/css/app.77b1644622e3bae24b6b.css.map
--- a/priv/static/static/font/fontello.1594134783339.woff
+++ b/priv/static/static/font/fontello.1594134783339.woff
--- a/priv/static/static/font/fontello.1594134783339.woff2
+++ b/priv/static/static/font/fontello.1594134783339.woff2
--- a/priv/static/static/font/fontello.1594374054351.eot
+++ b/priv/static/static/font/fontello.1594374054351.eot
--- a/priv/static/static/font/fontello.1594374054351.svg
+++ b/priv/static/static/font/fontello.1594374054351.svg
@ -90,6 +90,8 @@

 <glyph glyph-name="doc" unicode="&#xe829;" d="M819 645q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z" horiz-adv-x="857.1" />

+<glyph glyph-name="block" unicode="&#xe82a;" d="M732 359q0 90-48 164l-421-420q76-50 166-50 62 0 118 25t96 65 65 97 24 119z m-557-167l421 421q-75 50-167 50-83 0-153-40t-110-111-41-153q0-91 50-167z m682 167q0-88-34-168t-91-137-137-92-166-34-167 34-137 92-91 137-34 168 34 167 91 137 137 91 167 34 166-34 137-91 91-137 34-167z" horiz-adv-x="857.1" />
+
 <glyph glyph-name="spin3" unicode="&#xe832;" d="M494 857c-266 0-483-210-494-472-1-19 13-20 13-20l84 0c16 0 19 10 19 18 10 199 176 358 378 358 107 0 205-45 273-118l-58-57c-11-12-11-27 5-31l247-50c21-5 46 11 37 44l-58 227c-2 9-16 22-29 13l-65-60c-89 91-214 148-352 148z m409-508c-16 0-19-10-19-18-10-199-176-358-377-358-108 0-205 45-274 118l59 57c10 12 10 27-5 31l-248 50c-21 5-46-11-37-44l58-227c2-9 16-22 30-13l64 60c89-91 214-148 353-148 265 0 482 210 493 473 1 18-13 19-13 19l-84 0z" horiz-adv-x="1000" />

 <glyph glyph-name="spin4" unicode="&#xe834;" d="M498 857c-114 0-228-39-320-116l0 0c173 140 428 130 588-31 134-134 164-332 89-495-10-29-5-50 12-68 21-20 61-23 84 0 3 3 12 15 15 24 71 180 33 393-112 539-99 98-228 147-356 147z m-409-274c-14 0-29-5-39-16-3-3-13-15-15-24-71-180-34-393 112-539 185-185 479-195 676-31l0 0c-173-140-428-130-589 31-134 134-163 333-89 495 11 29 6 50-12 68-11 11-27 17-44 16z" horiz-adv-x="1001" />
--- a/priv/static/static/font/fontello.1594374054351.ttf
+++ b/priv/static/static/font/fontello.1594374054351.ttf
--- a/priv/static/static/font/fontello.1594374054351.woff
+++ b/priv/static/static/font/fontello.1594374054351.woff
--- a/priv/static/static/font/fontello.1594374054351.woff2
+++ b/priv/static/static/font/fontello.1594374054351.woff2
--- a/priv/static/static/fontello.1594374054351.css
+++ b/priv/static/static/fontello.1594374054351.css
--- a/priv/static/static/fontello.json
+++ b/priv/static/static/fontello.json
@ -399,6 +399,12 @@
      "css": "doc",
      "code": 59433,
      "src": "fontawesome"
+    },
+    {
+      "uid": "98d9c83c1ee7c2c25af784b518c522c5",
+      "css": "block",
+      "code": 59434,
+      "src": "fontawesome"
    }
  ]
 }
--- a/priv/static/static/js/10.2823375ec309b971aaea.js
+++ b/priv/static/static/js/10.2823375ec309b971aaea.js
--- a/priv/static/static/js/10.2823375ec309b971aaea.js.map
+++ b/priv/static/static/js/10.2823375ec309b971aaea.js.map
--- a/priv/static/static/js/11.2cb4b0f72a4654070a58.js
+++ b/priv/static/static/js/11.2cb4b0f72a4654070a58.js
--- a/priv/static/static/js/11.2cb4b0f72a4654070a58.js.map
+++ b/priv/static/static/js/11.2cb4b0f72a4654070a58.js.map
--- a/priv/static/static/js/12.500b3e4676dd47599a58.js
+++ b/priv/static/static/js/12.500b3e4676dd47599a58.js
--- a/priv/static/static/js/12.500b3e4676dd47599a58.js.map
+++ b/priv/static/static/js/12.500b3e4676dd47599a58.js.map
--- a/priv/static/static/js/13.3ef79a2643680080d28f.js
+++ b/priv/static/static/js/13.3ef79a2643680080d28f.js
--- a/priv/static/static/js/13.3ef79a2643680080d28f.js.map
+++ b/priv/static/static/js/13.3ef79a2643680080d28f.js.map
--- a/priv/static/static/js/14.b7f6eb3ea71d2ac2bb41.js
+++ b/priv/static/static/js/14.b7f6eb3ea71d2ac2bb41.js
--- a/priv/static/static/js/14.b7f6eb3ea71d2ac2bb41.js.map
+++ b/priv/static/static/js/14.b7f6eb3ea71d2ac2bb41.js.map
--- a/priv/static/static/js/14.cc092634462fd2a4cfbc.js.map
+++ b/priv/static/static/js/14.cc092634462fd2a4cfbc.js.map
--- a/priv/static/static/js/15.d814a29a970070494722.js
+++ b/priv/static/static/js/15.d814a29a970070494722.js
--- a/priv/static/static/js/15.d814a29a970070494722.js.map
+++ b/priv/static/static/js/15.d814a29a970070494722.js.map
--- a/priv/static/static/js/15.e9ddc5dfd38426398e00.js.map
+++ b/priv/static/static/js/15.e9ddc5dfd38426398e00.js.map
--- a/priv/static/static/js/16.017fa510b293035ac370.js
+++ b/priv/static/static/js/16.017fa510b293035ac370.js
--- a/priv/static/static/js/16.017fa510b293035ac370.js.map
+++ b/priv/static/static/js/16.017fa510b293035ac370.js.map
--- a/priv/static/static/js/16.476e7809b8593264469e.js.map
+++ b/priv/static/static/js/16.476e7809b8593264469e.js.map
--- a/priv/static/static/js/17.acbe4c09f05ae56c76a2.js.map
+++ b/priv/static/static/js/17.acbe4c09f05ae56c76a2.js.map
--- a/priv/static/static/js/17.c63932b65417ee7346a3.js
+++ b/priv/static/static/js/17.c63932b65417ee7346a3.js
--- a/priv/static/static/js/17.c63932b65417ee7346a3.js.map
+++ b/priv/static/static/js/17.c63932b65417ee7346a3.js.map
--- a/priv/static/static/js/18.a8ccd7f2a47c5c94b3b9.js.map
+++ b/priv/static/static/js/18.a8ccd7f2a47c5c94b3b9.js.map
--- a/priv/static/static/js/18.fd12f9746a55aa24a8b7.js
+++ b/priv/static/static/js/18.fd12f9746a55aa24a8b7.js
--- a/priv/static/static/js/18.fd12f9746a55aa24a8b7.js.map
+++ b/priv/static/static/js/18.fd12f9746a55aa24a8b7.js.map
--- a/priv/static/static/js/19.3adebd64964c92700074.js
+++ b/priv/static/static/js/19.3adebd64964c92700074.js
--- a/priv/static/static/js/19.3adebd64964c92700074.js.map
+++ b/priv/static/static/js/19.3adebd64964c92700074.js.map
--- a/priv/static/static/js/19.5894e9c12b4fd5e45872.js.map
+++ b/priv/static/static/js/19.5894e9c12b4fd5e45872.js.map
--- a/priv/static/static/js/2.d81ca020d6885c6c3b03.js
+++ b/priv/static/static/js/2.d81ca020d6885c6c3b03.js
--- a/priv/static/static/js/2.d81ca020d6885c6c3b03.js.map
+++ b/priv/static/static/js/2.d81ca020d6885c6c3b03.js.map
--- a/priv/static/static/js/2.f8dee9318a6f84ea92c3.js
+++ b/priv/static/static/js/2.f8dee9318a6f84ea92c3.js
--- a/priv/static/static/js/2.f8dee9318a6f84ea92c3.js.map
+++ b/priv/static/static/js/2.f8dee9318a6f84ea92c3.js.map
--- a/priv/static/static/js/20.43b5b27b0f68474f3b72.js.map
+++ b/priv/static/static/js/20.43b5b27b0f68474f3b72.js.map
--- a/priv/static/static/js/20.e0c3ad29d59470506c04.js
+++ b/priv/static/static/js/20.e0c3ad29d59470506c04.js
--- a/priv/static/static/js/20.e0c3ad29d59470506c04.js.map
+++ b/priv/static/static/js/20.e0c3ad29d59470506c04.js.map
--- a/priv/static/static/js/21.72b45b01be9d0f4c62ce.js.map
+++ b/priv/static/static/js/21.72b45b01be9d0f4c62ce.js.map
--- a/priv/static/static/js/21.849ecc09a1d58bdc64c6.js
+++ b/priv/static/static/js/21.849ecc09a1d58bdc64c6.js
--- a/priv/static/static/js/21.849ecc09a1d58bdc64c6.js.map
+++ b/priv/static/static/js/21.849ecc09a1d58bdc64c6.js.map
--- a/priv/static/static/js/22.26f13a22ad57a0d14670.js.map
+++ b/priv/static/static/js/22.26f13a22ad57a0d14670.js.map
--- a/priv/static/static/js/22.8782f133c9f66d3f2bbe.js
+++ b/priv/static/static/js/22.8782f133c9f66d3f2bbe.js
--- a/priv/static/static/js/22.8782f133c9f66d3f2bbe.js.map
+++ b/priv/static/static/js/22.8782f133c9f66d3f2bbe.js.map
--- a/priv/static/static/js/23.2653bf91bc77c2ed0160.js
+++ b/priv/static/static/js/23.2653bf91bc77c2ed0160.js
--- a/priv/static/static/js/23.2653bf91bc77c2ed0160.js.map
+++ b/priv/static/static/js/23.2653bf91bc77c2ed0160.js.map
--- a/priv/static/static/js/23.91a60b775352a806f887.js.map
+++ b/priv/static/static/js/23.91a60b775352a806f887.js.map
--- a/priv/static/static/js/24.c8d8438aac954d4707ac.js.map
+++ b/priv/static/static/js/24.c8d8438aac954d4707ac.js.map
--- a/priv/static/static/js/24.f931d864a2297d880a9a.js
+++ b/priv/static/static/js/24.f931d864a2297d880a9a.js
--- a/priv/static/static/js/24.f931d864a2297d880a9a.js.map
+++ b/priv/static/static/js/24.f931d864a2297d880a9a.js.map
--- a/priv/static/static/js/25.79ac9e020d571b67f02a.js.map
+++ b/priv/static/static/js/25.79ac9e020d571b67f02a.js.map
--- a/priv/static/static/js/25.886acc9ba83c64659279.js
+++ b/priv/static/static/js/25.886acc9ba83c64659279.js
--- a/priv/static/static/js/25.886acc9ba83c64659279.js.map
+++ b/priv/static/static/js/25.886acc9ba83c64659279.js.map
--- a/priv/static/static/js/26.3af8f54349f672f2c7c8.js.map
+++ b/priv/static/static/js/26.3af8f54349f672f2c7c8.js.map
--- a/priv/static/static/js/26.e15b1645079c72c60586.js
+++ b/priv/static/static/js/26.e15b1645079c72c60586.js
--- a/priv/static/static/js/26.e15b1645079c72c60586.js.map
+++ b/priv/static/static/js/26.e15b1645079c72c60586.js.map
--- a/priv/static/static/js/27.51287d408313da67b0b8.js.map
+++ b/priv/static/static/js/27.51287d408313da67b0b8.js.map
--- a/priv/static/static/js/27.7b41e5953f74af7fddd1.js
+++ b/priv/static/static/js/27.7b41e5953f74af7fddd1.js
--- a/priv/static/static/js/27.7b41e5953f74af7fddd1.js.map
+++ b/priv/static/static/js/27.7b41e5953f74af7fddd1.js.map
--- a/priv/static/static/js/28.4f39e562aaceaa01e883.js
+++ b/priv/static/static/js/28.4f39e562aaceaa01e883.js
--- a/priv/static/static/js/28.4f39e562aaceaa01e883.js.map
+++ b/priv/static/static/js/28.4f39e562aaceaa01e883.js.map
--- a/priv/static/static/js/28.be5118beb1098a81332d.js.map
+++ b/priv/static/static/js/28.be5118beb1098a81332d.js.map
--- a/priv/static/static/js/29.084f6fb0987d3862d410.js.map
+++ b/priv/static/static/js/29.084f6fb0987d3862d410.js.map
--- a/priv/static/static/js/29.137e2a68b558eed58152.js
+++ b/priv/static/static/js/29.137e2a68b558eed58152.js
--- a/priv/static/static/js/29.137e2a68b558eed58152.js.map
+++ b/priv/static/static/js/29.137e2a68b558eed58152.js.map
--- a/priv/static/static/js/3.56898c1005d9ba1b8d4a.js
+++ b/priv/static/static/js/3.56898c1005d9ba1b8d4a.js
--- a/priv/static/static/js/3.56898c1005d9ba1b8d4a.js.map
+++ b/priv/static/static/js/3.56898c1005d9ba1b8d4a.js.map
--- a/priv/static/static/js/30.6e6d63411def2e175d11.js.map
+++ b/priv/static/static/js/30.6e6d63411def2e175d11.js.map
--- a/priv/static/static/js/30.73e09f3b43617410dec7.js
+++ b/priv/static/static/js/30.73e09f3b43617410dec7.js
--- a/priv/static/static/js/30.73e09f3b43617410dec7.js.map
+++ b/priv/static/static/js/30.73e09f3b43617410dec7.js.map
--- a/priv/static/static/js/4.2d3bef896b463484e6eb.js
+++ b/priv/static/static/js/4.2d3bef896b463484e6eb.js
--- a/priv/static/static/js/4.2d3bef896b463484e6eb.js.map
+++ b/priv/static/static/js/4.2d3bef896b463484e6eb.js.map
--- a/priv/static/static/js/5.2b4a2787bacdd3d910db.js
+++ b/priv/static/static/js/5.2b4a2787bacdd3d910db.js
--- a/priv/static/static/js/5.2b4a2787bacdd3d910db.js.map
+++ b/priv/static/static/js/5.2b4a2787bacdd3d910db.js.map
--- a/priv/static/static/js/6.9c94bc0cc78979694cf4.js
+++ b/priv/static/static/js/6.9c94bc0cc78979694cf4.js
--- a/priv/static/static/js/6.9c94bc0cc78979694cf4.js.map
+++ b/priv/static/static/js/6.9c94bc0cc78979694cf4.js.map
--- a/priv/static/static/js/7.b4ac57fd946a3a189047.js
+++ b/priv/static/static/js/7.b4ac57fd946a3a189047.js
--- a/priv/static/static/js/7.b4ac57fd946a3a189047.js.map
+++ b/priv/static/static/js/7.b4ac57fd946a3a189047.js.map
--- a/priv/static/static/js/8.e03e32ca713d01db0433.js
+++ b/priv/static/static/js/8.e03e32ca713d01db0433.js
--- a/priv/static/static/js/8.e03e32ca713d01db0433.js.map
+++ b/priv/static/static/js/8.e03e32ca713d01db0433.js.map
--- a/priv/static/static/js/9.72d903ca8e0c5a532b87.js
+++ b/priv/static/static/js/9.72d903ca8e0c5a532b87.js
--- a/priv/static/static/js/9.72d903ca8e0c5a532b87.js.map
+++ b/priv/static/static/js/9.72d903ca8e0c5a532b87.js.map
--- a/priv/static/static/js/9.ef4eb9703f9aee67515e.js.map
+++ b/priv/static/static/js/9.ef4eb9703f9aee67515e.js.map
--- a/priv/static/static/js/app.1e68e208590653dab5aa.js
+++ b/priv/static/static/js/app.1e68e208590653dab5aa.js
--- a/priv/static/static/js/app.1e68e208590653dab5aa.js.map
+++ b/priv/static/static/js/app.1e68e208590653dab5aa.js.map
--- a/priv/static/static/js/app.53001fa190f37cf2743e.js
+++ b/priv/static/static/js/app.53001fa190f37cf2743e.js
--- a/priv/static/static/js/app.53001fa190f37cf2743e.js.map
+++ b/priv/static/static/js/app.53001fa190f37cf2743e.js.map
--- a/priv/static/static/js/vendors~app.247dc52c7abe6a0dab87.js
+++ b/priv/static/static/js/vendors~app.247dc52c7abe6a0dab87.js
--- a/priv/static/static/js/vendors~app.247dc52c7abe6a0dab87.js.map
+++ b/priv/static/static/js/vendors~app.247dc52c7abe6a0dab87.js.map
--- a/priv/static/static/js/vendors~app.8837fb59589d1dd6acda.js.map
+++ b/priv/static/static/js/vendors~app.8837fb59589d1dd6acda.js.map
--- a/priv/static/static/terms-of-service.html
+++ b/priv/static/static/terms-of-service.html
@ -2,7 +2,7 @@

 <p>This is the default placeholder ToS.  You should copy it over to your static folder and edit it to fit the needs of your instance.</p>

-<p>To do so, place a file at <code>"/instance/static/terms-of-service.html"</code> in your
+<p>To do so, place a file at <code>"/instance/static/static/terms-of-service.html"</code> in your
   Pleroma install containing the real ToS for your instance.</p>
 <p>See the <a href='https://docs.pleroma.social/backend/configuration/static_dir/'>Pleroma documentation</a> for more information.</p>
 <br>
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
--- a/Show More
+++ b/Show More