diff --git a/config/config.exs b/config/config.exs index c8d42e83e..662f5155f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -258,6 +258,7 @@ ], mrf_transparency: true, mrf_transparency_exclusions: [], + staff_transparency: [], autofollowed_nicknames: [], max_pinned_statuses: 1, no_attachment_links: true, diff --git a/config/custom_emoji.txt b/config/custom_emoji.txt index 4c4d72ed5..e69de29bb 100644 --- a/config/custom_emoji.txt +++ b/config/custom_emoji.txt @@ -1,82 +0,0 @@ -killme, /emoji/custom/guninmouth.png -blobhang, /emoji/custom/blobhang.png -thunking, /emoji/custom/thunking.png -akasmug, /emoji/custom/akasmug.png -luluconcern, /emoji/custom/lulucoconcern.png -lulucosmug, /emoji/custom/lulucosmug.png -akaheh, /emoji/custom/akaheh.png -kirbeats, /emoji/custom/kirbeats.png -226, /emoji/custom/226.png -abca, /emoji/custom/abca.png -akk, /emoji/custom/akk.png -aks-(2), /emoji/custom/aks-(2).png -aks3, /emoji/custom/aks3.png -aks, /emoji/custom/aks.png -amz, /emoji/custom/amz.png -aynm2, /emoji/custom/aynm2.png -aynm, /emoji/custom/aynm.png -bil, /emoji/custom/bil.png -bj, /emoji/custom/bj.png -br2, /emoji/custom/br2.png -br, /emoji/custom/br.png -brcr2, /emoji/custom/brcr2.png -brcr, /emoji/custom/brcr.png -bs, /emoji/custom/bs.png -bst, /emoji/custom/bst.png -crba, /emoji/custom/crba.png -crb, /emoji/custom/crb.png -crbrd, /emoji/custom/crbrd.png -crlp, /emoji/custom/crlp.png -dc, /emoji/custom/dc.png -edrj, /emoji/custom/edrj.png -fshud, /emoji/custom/fshud.png -ft, /emoji/custom/ft.png -hbk, /emoji/custom/hbk.png -hd, /emoji/custom/hd.png -hm, /emoji/custom/hm.png -hn, /emoji/custom/hn.png -hp, /emoji/custom/hp.png -hr, /emoji/custom/hr.png -hu, /emoji/custom/hu.png -i19, /emoji/custom/i19.png -irstrea, /emoji/custom/irstrea.png -jbr, /emoji/custom/jbr.png -jc, /emoji/custom/jc.png -jo2, /emoji/custom/jo2.png -jo, /emoji/custom/jo.png -kg, /emoji/custom/kg.png -ksrg, /emoji/custom/ksrg.png -laird, /emoji/custom/laird.png -lp, /emoji/custom/lp.png -mc, /emoji/custom/mc.png -mck2, /emoji/custom/mck2.png -mck, /emoji/custom/mck.png -mj, /emoji/custom/mj.png -mks, /emoji/custom/mks.png -mnc, /emoji/custom/mnc.png -my, /emoji/custom/my.png -ncrs, /emoji/custom/ncrs.png -nhi, /emoji/custom/nhi.png -nn, /emoji/custom/nn.png -ns, /emoji/custom/ns.png -oig, /emoji/custom/oig.png -pnx, /emoji/custom/pnx.png -ptld, /emoji/custom/ptld.png -rgr, /emoji/custom/rgr.png -rp, /emoji/custom/rp.png -sdeig, /emoji/custom/sdeig.png -sfk, /emoji/custom/sfk.png -sgr, /emoji/custom/sgr.png -sr, /emoji/custom/sr.png -srcy, /emoji/custom/srcy.png -tko2, /emoji/custom/tko2.png -tko, /emoji/custom/tko.png -udc, /emoji/custom/udc.png -unc, /emoji/custom/unc.png -wsfit2, /emoji/custom/wsfit2.png -wsfit, /emoji/custom/wsfit.png -ykkj, /emoji/custom/ykkj.png -ysr, /emoji/custom/ysr.png -z23, /emoji/custom/z23.png -z35, /emoji/custom/z35.png -z46, /emoji/custom/z46.png diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 533f82f6c..1cd37a25f 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -42,6 +42,7 @@ def raw_nodeinfo do staff_accounts = User.all_superusers() |> Enum.map(fn u -> u.ap_id end) + |> Enum.filter(fn u -> not Enum.member?(Config.get([:instance, :staff_transparency]), u) end) federation_response = if Config.get([:instance, :mrf_transparency]) do diff --git a/mix.exs b/mix.exs index c2e0b940f..308cae302 100644 --- a/mix.exs +++ b/mix.exs @@ -166,7 +166,8 @@ defp deps do {:captcha, git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, - {:mox, "~> 0.5", only: :test} + {:mox, "~> 0.5", only: :test}, + {:mrfcontrib, git: "https://github.com/FloatingGhost/pleroma-mrf-contrib.git", tag: "v0.0.5"} ] ++ oauth_deps() end diff --git a/mix.lock b/mix.lock index ff22791a4..7b453e6b9 100644 --- a/mix.lock +++ b/mix.lock @@ -66,6 +66,7 @@ "mock": {:hex, :mock, "0.3.3", "42a433794b1291a9cf1525c6d26b38e039e0d3a360732b5e467bfc77ef26c914", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, "mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"}, "mox": {:hex, :mox, "0.5.1", "f86bb36026aac1e6f924a4b6d024b05e9adbed5c63e8daa069bd66fb3292165b", [:mix], [], "hexpm"}, + "mrfcontrib": {:git, "https://github.com/FloatingGhost/pleroma-mrf-contrib.git", "8cecf964b6f9686ab11687e8267bc238a19bd3b6", [tag: "v0.0.5"]}, "myhtmlex": {:git, "https://git.pleroma.social/pleroma/myhtmlex.git", "ad0097e2f61d4953bfef20fb6abddf23b87111e6", [ref: "ad0097e2f61d4953bfef20fb6abddf23b87111e6", submodules: true]}, "nimble_parsec": {:hex, :nimble_parsec, "0.5.1", "c90796ecee0289dbb5ad16d3ad06f957b0cd1199769641c961cfe0b97db190e0", [:mix], [], "hexpm"}, "nodex": {:git, "https://git.pleroma.social/pleroma/nodex", "cb6730f943cfc6aad674c92161be23a8411f15d1", [ref: "cb6730f943cfc6aad674c92161be23a8411f15d1"]}, diff --git a/priv/static/images/akari.png b/priv/static/images/akari.png new file mode 100644 index 000000000..788bb63e1 Binary files /dev/null and b/priv/static/images/akari.png differ diff --git a/priv/static/index.html b/priv/static/index.html index e74f5b5d5..3f3ca5da2 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
\ No newline at end of file +Pleroma
\ No newline at end of file diff --git a/priv/static/static/config.json b/priv/static/static/config.json index 9e5390f7c..c82678699 100644 --- a/priv/static/static/config.json +++ b/priv/static/static/config.json @@ -1,5 +1,5 @@ { - "theme": "ihatebeingalive", + "theme": "pleroma-dark", "background": "/static/aurora_borealis.jpg", "logo": "/static/logo.png", "logoMask": true, diff --git a/priv/static/static/font/LICENSE.txt b/priv/static/static/font/LICENSE.txt deleted file mode 100755 index 95966f00e..000000000 --- a/priv/static/static/font/LICENSE.txt +++ /dev/null @@ -1,39 +0,0 @@ -Font license info - - -## Font Awesome - - Copyright (C) 2016 by Dave Gandy - - Author: Dave Gandy - License: SIL () - Homepage: http://fortawesome.github.com/Font-Awesome/ - - -## Entypo - - Copyright (C) 2012 by Daniel Bruce - - Author: Daniel Bruce - License: SIL (http://scripts.sil.org/OFL) - Homepage: http://www.entypo.com - - -## Iconic - - Copyright (C) 2012 by P.J. Onori - - Author: P.J. Onori - License: SIL (http://scripts.sil.org/OFL) - Homepage: http://somerandomdude.com/work/iconic/ - - -## Fontelico - - Copyright (C) 2012 by Fontello project - - Author: Crowdsourced, for Fontello project - License: SIL (http://scripts.sil.org/OFL) - Homepage: http://fontello.com - - diff --git a/priv/static/static/font/README.txt b/priv/static/static/font/README.txt deleted file mode 100755 index beaab3366..000000000 --- a/priv/static/static/font/README.txt +++ /dev/null @@ -1,75 +0,0 @@ -This webfont is generated by http://fontello.com open source project. - - -================================================================================ -Please, note, that you should obey original font licenses, used to make this -webfont pack. Details available in LICENSE.txt file. - -- Usually, it's enough to publish content of LICENSE.txt file somewhere on your - site in "About" section. - -- If your project is open-source, usually, it will be ok to make LICENSE.txt - file publicly available in your repository. - -- Fonts, used in Fontello, don't require a clickable link on your site. - But any kind of additional authors crediting is welcome. -================================================================================ - - -Comments on archive content ---------------------------- - -- /font/* - fonts in different formats - -- /css/* - different kinds of css, for all situations. Should be ok with - twitter bootstrap. Also, you can skip style and assign icon classes - directly to text elements, if you don't mind about IE7. - -- demo.html - demo file, to show your webfont content - -- LICENSE.txt - license info about source fonts, used to build your one. - -- config.json - keeps your settings. You can import it back into fontello - anytime, to continue your work - - -Why so many CSS files ? ------------------------ - -Because we like to fit all your needs :) - -- basic file, .css - is usually enough, it contains @font-face - and character code definitions - -- *-ie7.css - if you need IE7 support, but still don't wish to put char codes - directly into html - -- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face - rules, but still wish to benefit from css generation. That can be very - convenient for automated asset build systems. When you need to update font - - no need to manually edit files, just override old version with archive - content. See fontello source code for examples. - -- *-embedded.css - basic css file, but with embedded WOFF font, to avoid - CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. - We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` - server headers. But if you ok with dirty hack - this file is for you. Note, - that data url moved to separate @font-face to avoid problems with - - - - - - - -
-

fontello font demo

- -
-
-
-
icon-cancel0xe800
-
icon-upload0xe801
-
icon-star0xe802
-
icon-star-empty0xe803
-
-
-
icon-retweet0xe804
-
icon-eye-off0xe805
-
icon-search0xe806
-
icon-cog0xe807
-
-
-
icon-logout0xe808
-
icon-down-open0xe809
-
icon-attach0xe80a
-
icon-picture0xe80b
-
-
-
icon-video0xe80c
-
icon-right-open0xe80d
-
icon-left-open0xe80e
-
icon-up-open0xe80f
-
-
-
icon-bell-ringing-o0xe810
-
icon-lock0xe811
-
icon-globe0xe812
-
icon-brush0xe813
-
-
-
icon-attention0xe814
-
icon-plus0xe815
-
icon-adjust0xe816
-
icon-edit0xe817
-
-
-
icon-pencil0xe818
-
icon-pin0xe819
-
icon-wrench0xe81a
-
icon-chart-bar0xe81b
-
-
-
icon-zoom-in0xe81c
-
icon-spin30xe832
-
icon-spin40xe834
-
icon-link-ext0xf08e
-
-
-
icon-link-ext-alt0xf08f
-
icon-menu0xf0c9
-
icon-mail-alt0xf0e0
-
icon-gauge0xf0e4
-
-
-
icon-comment-empty0xf0e5
-
icon-bell-alt0xf0f3
-
icon-plus-squared0xf0fe
-
icon-reply0xf112
-
-
-
icon-smile0xf118
-
icon-lock-open-alt0xf13e
-
icon-ellipsis0xf141
-
icon-play-circled0xf144
-
-
-
icon-thumbs-up-alt0xf164
-
icon-binoculars0xf1e5
-
icon-user-plus0xf234
-
-
-
Generated by fontello.com
- - \ No newline at end of file diff --git a/priv/static/static/font/font/fontello.eot b/priv/static/static/font/font/fontello.eot deleted file mode 100755 index 1703fd97f..000000000 Binary files a/priv/static/static/font/font/fontello.eot and /dev/null differ diff --git a/priv/static/static/font/font/fontello.svg b/priv/static/static/font/font/fontello.svg deleted file mode 100755 index f5e497ce4..000000000 --- a/priv/static/static/font/font/fontello.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - -Copyright (C) 2019 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/priv/static/static/font/font/fontello.ttf b/priv/static/static/font/font/fontello.ttf deleted file mode 100755 index e9ed78031..000000000 Binary files a/priv/static/static/font/font/fontello.ttf and /dev/null differ diff --git a/priv/static/static/font/font/fontello.woff b/priv/static/static/font/font/fontello.woff deleted file mode 100755 index 1d5025d3c..000000000 Binary files a/priv/static/static/font/font/fontello.woff and /dev/null differ diff --git a/priv/static/static/font/font/fontello.woff2 b/priv/static/static/font/font/fontello.woff2 deleted file mode 100755 index 078991eb8..000000000 Binary files a/priv/static/static/font/font/fontello.woff2 and /dev/null differ diff --git a/priv/static/static/font/fontello.1576166651574.woff b/priv/static/static/font/fontello.1576166651574.woff deleted file mode 100644 index bbffd6413..000000000 Binary files a/priv/static/static/font/fontello.1576166651574.woff and /dev/null differ diff --git a/priv/static/static/font/fontello.1576166651574.woff2 b/priv/static/static/font/fontello.1576166651574.woff2 deleted file mode 100644 index d35dce862..000000000 Binary files a/priv/static/static/font/fontello.1576166651574.woff2 and /dev/null differ diff --git a/priv/static/static/font/fontello.1576166651574.eot b/priv/static/static/font/fontello.1578247524147.eot similarity index 80% rename from priv/static/static/font/fontello.1576166651574.eot rename to priv/static/static/font/fontello.1578247524147.eot index fb27d4037..a2b97f903 100644 Binary files a/priv/static/static/font/fontello.1576166651574.eot and b/priv/static/static/font/fontello.1578247524147.eot differ diff --git a/priv/static/static/font/fontello.1576166651574.svg b/priv/static/static/font/fontello.1578247524147.svg old mode 100755 new mode 100644 similarity index 89% rename from priv/static/static/font/fontello.1576166651574.svg rename to priv/static/static/font/fontello.1578247524147.svg index f5e497ce4..98111ac20 --- a/priv/static/static/font/fontello.1576166651574.svg +++ b/priv/static/static/font/fontello.1578247524147.svg @@ -1,7 +1,7 @@ -Copyright (C) 2019 by original authors @ fontello.com +Copyright (C) 2020 by original authors @ fontello.com @@ -64,6 +64,16 @@ + + + + + + + + + + diff --git a/priv/static/static/font/fontello.1576166651574.ttf b/priv/static/static/font/fontello.1578247524147.ttf similarity index 80% rename from priv/static/static/font/fontello.1576166651574.ttf rename to priv/static/static/font/fontello.1578247524147.ttf index c49743ec6..73381523d 100644 Binary files a/priv/static/static/font/fontello.1576166651574.ttf and b/priv/static/static/font/fontello.1578247524147.ttf differ diff --git a/priv/static/static/font/fontello.1578247524147.woff b/priv/static/static/font/fontello.1578247524147.woff new file mode 100644 index 000000000..221ffab43 Binary files /dev/null and b/priv/static/static/font/fontello.1578247524147.woff differ diff --git a/priv/static/static/font/fontello.1578247524147.woff2 b/priv/static/static/font/fontello.1578247524147.woff2 new file mode 100644 index 000000000..4dca62373 Binary files /dev/null and b/priv/static/static/font/fontello.1578247524147.woff2 differ diff --git a/priv/static/static/font/lato-v15-latin-regular.eot b/priv/static/static/font/lato-v15-latin-regular.eot deleted file mode 100644 index c64130696..000000000 Binary files a/priv/static/static/font/lato-v15-latin-regular.eot and /dev/null differ diff --git a/priv/static/static/font/lato-v15-latin-regular.svg b/priv/static/static/font/lato-v15-latin-regular.svg deleted file mode 100644 index 55b43fb86..000000000 --- a/priv/static/static/font/lato-v15-latin-regular.svg +++ /dev/null @@ -1,435 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/priv/static/static/font/lato-v15-latin-regular.ttf b/priv/static/static/font/lato-v15-latin-regular.ttf deleted file mode 100644 index 3c2d417ea..000000000 Binary files a/priv/static/static/font/lato-v15-latin-regular.ttf and /dev/null differ diff --git a/priv/static/static/font/lato-v15-latin-regular.woff b/priv/static/static/font/lato-v15-latin-regular.woff deleted file mode 100644 index 189a0feb5..000000000 Binary files a/priv/static/static/font/lato-v15-latin-regular.woff and /dev/null differ diff --git a/priv/static/static/font/lato-v15-latin-regular.woff2 b/priv/static/static/font/lato-v15-latin-regular.woff2 deleted file mode 100644 index 6904b6649..000000000 Binary files a/priv/static/static/font/lato-v15-latin-regular.woff2 and /dev/null differ diff --git a/priv/static/static/fontello.1576166651574.css b/priv/static/static/fontello.1578246810517.css similarity index 81% rename from priv/static/static/fontello.1576166651574.css rename to priv/static/static/fontello.1578246810517.css index 54f9fe05f..511b06f38 100644 Binary files a/priv/static/static/fontello.1576166651574.css and b/priv/static/static/fontello.1578246810517.css differ diff --git a/priv/static/static/fontello.1578247384151.css b/priv/static/static/fontello.1578247384151.css new file mode 100644 index 000000000..9a310837e Binary files /dev/null and b/priv/static/static/fontello.1578247384151.css differ diff --git a/priv/static/static/fontello.1578247524147.css b/priv/static/static/fontello.1578247524147.css new file mode 100644 index 000000000..c16087b42 Binary files /dev/null and b/priv/static/static/fontello.1578247524147.css differ diff --git a/priv/static/static/fontello.json b/priv/static/static/fontello.json index c0cf17271..c1ed33938 100755 --- a/priv/static/static/fontello.json +++ b/priv/static/static/fontello.json @@ -303,6 +303,36 @@ "css": "gauge", "code": 61668, "src": "fontawesome" + }, + { + "uid": "31972e4e9d080eaa796290349ae6c1fd", + "css": "users", + "code": 59421, + "src": "fontawesome" + }, + { + "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2", + "css": "info-circled", + "code": 59423, + "src": "fontawesome" + }, + { + "uid": "w3nzesrlbezu6f30q7ytyq919p6gdlb6", + "css": "home-2", + "code": 59425, + "src": "typicons" + }, + { + "uid": "dcedf50ab1ede3283d7a6c70e2fe32f3", + "css": "chat", + "code": 59422, + "src": "fontawesome" + }, + { + "uid": "3a00327e61b997b58518bd43ed83c3df", + "css": "login", + "code": 59424, + "src": "fontawesome" } ] } \ No newline at end of file diff --git a/priv/static/static/img/nsfw.74818f9.png b/priv/static/static/img/nsfw.74818f9.png index e0d1fc2a9..d25137767 100644 Binary files a/priv/static/static/img/nsfw.74818f9.png and b/priv/static/static/img/nsfw.74818f9.png differ diff --git a/priv/static/static/js/2.7eaed4ad0d253fad6f55.js b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js new file mode 100644 index 000000000..5c8446f1a Binary files /dev/null and b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js differ diff --git a/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map new file mode 100644 index 000000000..c92dcc8fc Binary files /dev/null and b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map differ diff --git a/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js b/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js deleted file mode 100644 index 910d304d3..000000000 Binary files a/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js and /dev/null differ diff --git a/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map b/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map deleted file mode 100644 index 25e514a5b..000000000 Binary files a/priv/static/static/js/2.c96b30ae9f2d3f46f0ad.js.map and /dev/null differ diff --git a/priv/static/static/js/app.604a1098dbb3e2287751.js b/priv/static/static/js/app.604a1098dbb3e2287751.js new file mode 100644 index 000000000..93021da61 Binary files /dev/null and b/priv/static/static/js/app.604a1098dbb3e2287751.js differ diff --git a/priv/static/static/js/app.604a1098dbb3e2287751.js.map b/priv/static/static/js/app.604a1098dbb3e2287751.js.map new file mode 100644 index 000000000..e9e44b5d0 Binary files /dev/null and b/priv/static/static/js/app.604a1098dbb3e2287751.js.map differ diff --git a/priv/static/static/js/app.a48779d14f1bf30f0cb2.js b/priv/static/static/js/app.a48779d14f1bf30f0cb2.js deleted file mode 100644 index 2828ccd93..000000000 Binary files a/priv/static/static/js/app.a48779d14f1bf30f0cb2.js and /dev/null differ diff --git a/priv/static/static/js/app.a48779d14f1bf30f0cb2.js.map b/priv/static/static/js/app.a48779d14f1bf30f0cb2.js.map deleted file mode 100644 index b59b33065..000000000 Binary files a/priv/static/static/js/app.a48779d14f1bf30f0cb2.js.map and /dev/null differ diff --git a/priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js b/priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js deleted file mode 100644 index 154a9cbfd..000000000 Binary files a/priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js and /dev/null differ diff --git a/priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js.map b/priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js.map deleted file mode 100644 index 244946fa1..000000000 Binary files a/priv/static/static/js/vendors~app.c2e8b58fd92bd16e962b.js.map and /dev/null differ diff --git a/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js new file mode 100644 index 000000000..18bac2d14 Binary files /dev/null and b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js differ diff --git a/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map new file mode 100644 index 000000000..539456264 Binary files /dev/null and b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map differ diff --git a/priv/static/static/static-fe.css b/priv/static/static/static-fe.css deleted file mode 100644 index 19c56387b..000000000 Binary files a/priv/static/static/static-fe.css and /dev/null differ diff --git a/priv/static/static/stickers.json b/priv/static/static/stickers.json index 79164e8d3..05155795e 100644 --- a/priv/static/static/stickers.json +++ b/priv/static/static/stickers.json @@ -1 +1,2 @@ -{"menhera": "/static/stickers/menhera/", "yotsuba": "/static/stickers/yotsuba/", "yuruyuri": "/static/stickers/yuruyuri/", "bocchi": "/static/stickers/bocchi/", "yurukawa": "/static/stickers/yurukawa/", "gabdrop": "/static/stickers/gabdrop/", "evangelion": "/static/stickers/evangelion/", "shakaijin_kanojo": "/static/stickers/shakaijin_kanojo/", "pko": "/static/stickers/pko/"} \ No newline at end of file +{"menhera": "/static/stickers/menhera/", "yotsuba": "/static/stickers/yotsuba/", "yuruyuri": "/static/stickers/yuruyuri/", "bocchi": "/static/stickers/bocchi/", "yurukawa": "/static/stickers/yurukawa/", "gabdrop": "/static/stickers/gabdrop/", "evangelion": "/static/stickers/evangelion/", "shakaijin_kanojo": "/static/stickers/shakaijin_kanojo/", "pko": "/static/stickers/pko/", "ihba": "/static/stickers/ihba/" +} diff --git a/priv/static/static/stickers/bocchi/aughh.png b/priv/static/static/stickers/bocchi/aughh.png new file mode 100644 index 000000000..3bfb7a133 Binary files /dev/null and b/priv/static/static/stickers/bocchi/aughh.png differ diff --git a/priv/static/static/stickers/bocchi/pack.json b/priv/static/static/stickers/bocchi/pack.json index d5b25ca98..fcc13b1c7 100644 --- a/priv/static/static/stickers/bocchi/pack.json +++ b/priv/static/static/stickers/bocchi/pack.json @@ -2,5 +2,5 @@ "title": "bocchi", "author": "idk", "tabIcon": "tab.png", - "stickers": ["194967309.png", "189407786.png", "194967307.png", "189407792.png", "161963392.png", "189407795.png", "194967313.png", "189407794.png", "194967308.png", "189407785.png", "161963394.png", "189407787.png", "194967312.png", "194967314.png", "194967311.png", "189407797.png", "161963396.png", "189407793.png", "194967317.png", "161963389.png", "161963397.png", "161963388.png", "194967310.png", "161963386.png", "189407789.png", "194967303.png", "161963385.png", "189407788.png", "194967304.png", "194967306.png", "189407784.png", "161963382.png", "189407783.png", "194967315.png", "194967305.png", "189407790.png", "161963390.png", "161963383.png", "161963395.png", "161963387.png", "194967302.png", "194967316.png", "189407796.png", "189407782.png", "161963393.png", "189407791.png", "161963384.png", "161963391.png"] + "stickers": ["194967309.png", "189407786.png", "194967307.png", "189407792.png", "161963392.png", "189407795.png", "194967313.png", "189407794.png", "194967308.png", "189407785.png", "161963394.png", "189407787.png", "194967312.png", "194967314.png", "194967311.png", "189407797.png", "161963396.png", "189407793.png", "194967317.png", "161963389.png", "161963397.png", "161963388.png", "194967310.png", "161963386.png", "189407789.png", "194967303.png", "161963385.png", "189407788.png", "194967304.png", "194967306.png", "189407784.png", "161963382.png", "189407783.png", "194967315.png", "194967305.png", "189407790.png", "161963390.png", "161963383.png", "161963395.png", "161963387.png", "194967302.png", "194967316.png", "189407796.png", "189407782.png", "161963393.png", "189407791.png", "161963384.png", "161963391.png", "aughh.png"] } diff --git a/priv/static/static/stickers/ihba/hifusip.png b/priv/static/static/stickers/ihba/hifusip.png new file mode 100644 index 000000000..02135039c Binary files /dev/null and b/priv/static/static/stickers/ihba/hifusip.png differ diff --git a/priv/static/static/stickers/ihba/pack.json b/priv/static/static/stickers/ihba/pack.json new file mode 100644 index 000000000..939c6e36c --- /dev/null +++ b/priv/static/static/stickers/ihba/pack.json @@ -0,0 +1,6 @@ +{ + "title": "ihba", + "author": "idk", + "tabIcon": "tab.png", + "stickers": ["hifusip.png"] +} diff --git a/priv/static/static/stickers/ihba/pack_on.png b/priv/static/static/stickers/ihba/pack_on.png new file mode 100644 index 000000000..02135039c Binary files /dev/null and b/priv/static/static/stickers/ihba/pack_on.png differ diff --git a/priv/static/static/stickers/ihba/tab.png b/priv/static/static/stickers/ihba/tab.png new file mode 100644 index 000000000..02135039c Binary files /dev/null and b/priv/static/static/stickers/ihba/tab.png differ diff --git a/priv/static/static/stickers/ihba/tab_off.png b/priv/static/static/stickers/ihba/tab_off.png new file mode 100644 index 000000000..02135039c Binary files /dev/null and b/priv/static/static/stickers/ihba/tab_off.png differ diff --git a/priv/static/static/stickers/ihba/tab_on.png b/priv/static/static/stickers/ihba/tab_on.png new file mode 100644 index 000000000..02135039c Binary files /dev/null and b/priv/static/static/stickers/ihba/tab_on.png differ diff --git a/priv/static/static/terms-of-service.html b/priv/static/static/terms-of-service.html index e3823b032..16ce636b6 100644 --- a/priv/static/static/terms-of-service.html +++ b/priv/static/static/terms-of-service.html @@ -1,6 +1,6 @@

Terms of Service

-

It's mainly "be nice"

+

It's mainly "be nice".

  1. diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js index 40f700f90..007e77d9f 100644 Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ diff --git a/priv/static/sw-pleroma.js.map b/priv/static/sw-pleroma.js.map index 1ac8d8676..5d9874693 100644 Binary files a/priv/static/sw-pleroma.js.map and b/priv/static/sw-pleroma.js.map differ