starting over since merge conflicts are a pain

nu-8777
twl 6 months ago
parent e0cdb2848f
commit 11d03746eb

@ -1,43 +1,5 @@
<div style="margin-left:12px; margin-right:12px">
<p style="text-align:center">
Welcome to the Froth Zone!
<br />
<a href="https://bloat.froth.zone" rel="noopener noreferrer nofollow">
Bloat FE
</a>
|
<a href="https://glitch.froth.zone" rel="noopener noreferrer nofollow">
Masto FE
</a>
|
<a href="/main/all" rel="noopener noreferrer nofollow">
Pleroma FE
</a>
|
<a href="https://treebird.froth.zone" rel="noopener noreferrer nofollow">
Treebird FE
</a>
<br />
<br />
<a href="https://poopchan.org" rel="noopener noreferrer nofollow">
Fchan
</a>
|
<a href="https://funkwhale.samtherapy.net" rel="noopener noreferrer nofollow">
Funkwhale
</a>
|
<a href="https://mk.froth.zone" rel="noopener noreferrer nofollow">
Misskey
</a>
|
<a href="https://tube.froth.zone" rel="noopener noreferrer nofollow">
PeerTube
</a>
<br />
<br />
<a href="https://status.froth.zone/status" rel="noopener noreferrer nofollow">
Everything else I host
</a>
</p>
<center><p><a href="https://bloat.8777.ch">Epsilon Bloat FE</a> | <a href="https://tree.8777.ch">Sigma Treebird FE</a></p></center>
<iframe width="100%" height="330" scrolling="no" frameborder="no" src="https://live.grumbulon.xyz/front/embed.html?&amp;type=playlist&amp;id=39"></iframe><br>
<center><sub>brotip: you can close this dialog by enabling "Hide instance-specific panel" in the settings</sub></center><br>
</div>

@ -0,0 +1,12 @@
#!/bin/bash
TARGET="/opt/pleroma" # CHANGE ME
yarn install -D
rm -rf dist/*
npm run build
rsync --update -Pr dist/ "${TARGET}/instance/static/"
rsync --update -ra dist/static/ "${TARGET}/instance/static/static"
rsync -ra instance/ "${TARGET}/instance/static/instance"

@ -33,7 +33,7 @@
"staff": "Staff"
},
"shoutbox": {
"title": "Frothbox"
"title": "Psych Ward"
},
"domain_mute_card": {
"mute": "Mute",
@ -80,7 +80,7 @@
"close": "Close",
"peek": "Peek",
"role": {
"admin": "Janny Queen",
"admin": "Admin",
"moderator": "Janny"
}
},
@ -100,7 +100,7 @@
"description": "Log in with OAuth",
"logout": "Log out",
"password": "Password",
"placeholder": "e.g. lain",
"placeholder": "e.g. twl",
"register": "Register",
"username": "Username",
"hint": "Log in to join the discussion",
@ -127,7 +127,7 @@
"mentions": "Mentions",
"interactions": "Interactions",
"dms": "Direct messages",
"public_tl": "Public timeline",
"public_tl": "Local timeline",
"timeline": "Timeline",
"home_timeline": "Home timeline",
"twkn": "Known Network",
@ -202,12 +202,12 @@
"text/markdown": "Markdown",
"text/bbcode": "BBCode"
},
"content_warning": "Subject (optional)",
"default": "Garbage Inserted",
"content_warning": "Subject/Content Warning (optional)",
"default": "Just landed in Kileen TX.",
"direct_warning_to_all": "This post will be visible to all the mentioned users.",
"direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
"posting": "Expeling",
"post": "Expel",
"posting": "Preaching",
"post": "Preach",
"preview": "Preview",
"preview_empty": "Empty",
"empty_status_error": "Can't post an empty status with no files",
@ -362,7 +362,7 @@
"max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
"hide_isp": "Hide instance-specific panel",
"show_third_column": "Move Notifications to a seperate column",
"hide_shoutbox": "Hide instance frothbox",
"hide_shoutbox": "Hide instance Psych Ward",
"compact_nav_panel": "Compact navigation panel",
"compact_user_panel": "Compact user panel",
"right_sidebar": "Reverse order of columns",
@ -525,7 +525,7 @@
"mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)",
"mention_link_bolden_you": "Highlight mention of you when you are mentioned",
"fun": "Fun",
"greentext": "Meme arrows",
"greentext": "Meme arrows (Greentext)",
"conversation_view": "Conversation View",
"mentions": "Mentions",
"showTimelines": "Expand timeline options by default",

@ -39,7 +39,7 @@ export const defaultState = {
muteBotStatuses: undefined, // instance default
collapseMessageWithSubject: undefined, // instance default
padEmoji: true,
swapReacts: true,
swapReacts: false,
hideAttachments: false,
hideAttachmentsInConv: false,
maxThumbnails: 16,
@ -85,7 +85,7 @@ export const defaultState = {
useContainFit: true,
disableStickyHeaders: false,
showScrollbars: false,
greentext: undefined, // instance default
greentext: true,
useAtIcon: undefined, // instance default
mentionLinkDisplay: undefined, // instance default
mentionLinkShowTooltip: undefined, // instance default

@ -1,17 +1,5 @@
<h2>Welcome to the Froth Zone!</h2>
<h4>
You need a valid email to sign up.<br />You will be sent an validation email.
</h4>
<h6>If I know who you are I might make an exception to that.</h6>
<h3>Actual Terms</h3>
<ol>
<li>Do not post anything that is illegal in the US.</li>
<li>Do not post anything NSFW without tagging it.</li>
<li>Do not post only NSFW. Go somewhere else for that.</li>
<li>No block evasion.</li>
<li>No doxing.</li>
<li>No spamming or shilling. Go back to Twitter.</li>
<li>Do not imitate being someone without their permission.</li>
</ol>
<center><h3>all animals are equal, but some are more equal than others.</h3>
<hr>
the rules are: don't make me add rules<br>
<img src="/static/rule98.gif">
</center>

Loading…
Cancel
Save