diff --git a/priv/static/index.html b/priv/static/index.html index e995a811b..a800d20f5 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
+Pleroma
\ No newline at end of file diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html index f83c8c636..8fb6f0e74 100644 --- a/priv/static/instance/panel.html +++ b/priv/static/instance/panel.html @@ -1,8 +1,6 @@

The only Pleroma instance dedicated to screaming into the void and exclaiming how much you'd rather not be living through the pain that is existence.

-

All users can sign into XMPP running on this domain with their pleroma credentials!

-

Sadposting admin is @FloatingGhost@ihatebeinga.live

Registrations are currently disabled, but if you want an account feel free to message me via any method listed on my profile, or discord@SadMeme#8080 (I very rarely use this so I might be a bit slow)

@@ -11,12 +9,6 @@ Frontends:

Sad FE | Pleroma FE | Mastodon FE

+About this instance
- -National Anthem: - - -
diff --git a/priv/static/static/js/app.04db7997189e10d53373.js b/priv/static/static/js/app.04db7997189e10d53373.js new file mode 100644 index 000000000..a93cc7ce0 Binary files /dev/null and b/priv/static/static/js/app.04db7997189e10d53373.js differ diff --git a/priv/static/static/js/app.04db7997189e10d53373.js.map b/priv/static/static/js/app.04db7997189e10d53373.js.map new file mode 100644 index 000000000..eb1f60fde Binary files /dev/null and b/priv/static/static/js/app.04db7997189e10d53373.js.map differ diff --git a/priv/static/static/js/app.105d64a8fcdd6724ccde.js b/priv/static/static/js/app.105d64a8fcdd6724ccde.js deleted file mode 100644 index 9cb129d22..000000000 Binary files a/priv/static/static/js/app.105d64a8fcdd6724ccde.js and /dev/null differ diff --git a/priv/static/static/js/app.105d64a8fcdd6724ccde.js.map b/priv/static/static/js/app.105d64a8fcdd6724ccde.js.map deleted file mode 100644 index ab2588f48..000000000 Binary files a/priv/static/static/js/app.105d64a8fcdd6724ccde.js.map and /dev/null differ diff --git a/priv/static/static/js/app.1a32adc2a9166c7b0a3d.js b/priv/static/static/js/app.1a32adc2a9166c7b0a3d.js deleted file mode 100644 index f4c5f2d38..000000000 Binary files a/priv/static/static/js/app.1a32adc2a9166c7b0a3d.js and /dev/null differ diff --git a/priv/static/static/js/app.1a32adc2a9166c7b0a3d.js.map b/priv/static/static/js/app.1a32adc2a9166c7b0a3d.js.map deleted file mode 100644 index fbc4c61e5..000000000 Binary files a/priv/static/static/js/app.1a32adc2a9166c7b0a3d.js.map and /dev/null differ diff --git a/priv/static/static/js/vendors~app.131a5a4717d2cca805ad.js b/priv/static/static/js/vendors~app.131a5a4717d2cca805ad.js deleted file mode 100644 index 398e146ac..000000000 Binary files a/priv/static/static/js/vendors~app.131a5a4717d2cca805ad.js and /dev/null differ diff --git a/priv/static/static/js/vendors~app.131a5a4717d2cca805ad.js.map b/priv/static/static/js/vendors~app.131a5a4717d2cca805ad.js.map deleted file mode 100644 index 06e8e5623..000000000 Binary files a/priv/static/static/js/vendors~app.131a5a4717d2cca805ad.js.map and /dev/null differ diff --git a/priv/static/static/styles.json b/priv/static/static/styles.json index 9ebc60eaa..4c564d125 100644 --- a/priv/static/static/styles.json +++ b/priv/static/static/styles.json @@ -11,9 +11,6 @@ "redmond-xxi": "/static/themes/redmond-xxi.json", "breezy-dark": "/static/themes/breezy-dark.json", "breezy-light": "/static/themes/breezy-light.json", -<<<<<<< HEAD - "ihatebeingalive": "/static/themes/ihatebeingalive.json" -======= + "ihatebeingalive": "/static/themes/ihatebeingalive.json", "mammal": "/static/themes/mammal.json" ->>>>>>> 8a03ce50ea30df3754f2d9856829b036c878e063 } diff --git a/priv/static/static/terms-of-service.html b/priv/static/static/terms-of-service.html index 7a73b67fe..b0ea3abfa 100644 --- a/priv/static/static/terms-of-service.html +++ b/priv/static/static/terms-of-service.html @@ -1,6 +1,6 @@

Terms of Service

-

I'm pretty lax provided you're nice

+

Nothing super complex, just a few things

  1. diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js index 6c1c99498..a040912dc 100644 Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ