Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

diff --git a/config/custom_emoji.txt b/config/custom_emoji.txt
new file mode 100644 (file)
index 0000000..4c4d72e
--- /dev/null
+++ b/config/custom_emoji.txt
@@ -0,0 +1,82 @@
+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/priv/static/favicon.png b/priv/static/favicon.png
index a96d5d25225abd92a95b35c58b301463752cf335..c961481fb8aac6159876ba34155511b7370ae879 100644 (file)
Binary files a/priv/static/favicon.png and b/priv/static/favicon.png differ

diff --git a/priv/static/images/5cm.jpg b/priv/static/images/5cm.jpg
new file mode 100644 (file)
index 0000000..3d24345
Binary files /dev/null and b/priv/static/images/5cm.jpg differ

diff --git a/priv/static/images/5cm.png b/priv/static/images/5cm.png
new file mode 100644 (file)
index 0000000..c56a71c
Binary files /dev/null and b/priv/static/images/5cm.png differ

diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html
index 7e73e482490989356e02e69980d235bd92e9859a..81583d1dd5bf81310ffa9f5969173300ee27b2c2 100644 (file)
--- a/priv/static/instance/panel.html
+++ b/priv/static/instance/panel.html
@@ -1,5 +1,16 @@
 <div style="margin-left:12px; margin-right:12px">
-<p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p>    
-<p><a href="/main/all">Pleroma FE</a> | <a href="/web">Mastodon FE</a></p>
+<p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p>
+<p>Sadposting admin is <a href="/FloatingGhost">@FloatingGhost@ihatebeinga.live</a></p>
+
+<hr />
+
+<!--<p>Self-signup is disabled right now because a meanie took advantage of it to flood acccounts.</p>
+<p>If you want an account, feel free to fling an <a href="mailto:hannah@coffee-and-dreams.uk">email</a>  (<a href="https://coffee-and-dreams.uk/pubkey.asc">PGP Key</a>) or XMPP
+message to the admin.</p>
+
+<hr />-->
+
+Frontends: 
+<p><a href="https://sad.ihatebeinga.live">Sad FE</a> | <a href="/main/all">Pleroma FE</a> | <a href="/web">Mastodon FE</a></p>
 </div>
 

diff --git a/priv/static/static/aurora_borealis.jpg b/priv/static/static/aurora_borealis.jpg
index 230e2abd7368e425ae362c3bb9b906486f4cf29e..1c61da38c49e488130134d91eac8a56a9bc00e99 100644 (file)
Binary files a/priv/static/static/aurora_borealis.jpg and b/priv/static/static/aurora_borealis.jpg differ

diff --git a/priv/static/static/img/nsfw.74818f9.png b/priv/static/static/img/nsfw.74818f9.png
index d251377676855aa1c25428a1175c1372b10940cd..e0d1fc2a93ca669e9b7549c58d4dba8f31836287 100644 (file)
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/logo.png b/priv/static/static/logo.png
index 7744b1acc313c5a146410cc5a56d99629022c637..14aaf4a3f180ca6809611f1e65279f263f3ff92e 100644 (file)
Binary files a/priv/static/static/logo.png and b/priv/static/static/logo.png differ

diff --git a/priv/static/static/terms-of-service.html b/priv/static/static/terms-of-service.html
index c02cb71984bbd6af9bf8bdcea61cfadca0161bfe..22a72f17d7683370bd5f179ffb286fa05503d2ac 100644 (file)
--- a/priv/static/static/terms-of-service.html
+++ b/priv/static/static/terms-of-service.html
@@ -1,7 +1,19 @@
 <h4>Terms of Service</h4>
 
-<p>This is a placeholder ToS.</p>
+<p>I'm pretty lax</p>
+
+<ol>
+    <li>
+        <h3>Don't be a big meanie</h4>
+        <h5>Arguments are cool and all but don't resort to stuff like flamewars. No hard limits though.</h5>
+    </li>
+    <li>
+        <h3>Mark your lewds!</h3>
+        <h5>Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive and anything goes</h5>
+    </li>
+</ol>
+
+<p>So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.</p>
 
-<p>Edit <code>"/static/terms-of-service.html"</code> to make it fit the needs of your instance.</p>
 <br>
 <img src="/static/logo.png"/ style="display: block; margin: auto;">