Archived
1
0

resolve conflict

This commit is contained in:
jeff
2015-09-04 16:51:19 -04:00
9 changed files with 213 additions and 29 deletions

View File

@@ -4,6 +4,44 @@
<title> NNTPChan Frequently Asked Questions</title>
</head>
<body>
<p>No CP or anything illegal under United States law allowed. All posts on this site are the responsibility of the individual poster and not the administration of this site</p>
<h2>NNTPChan faq </h2>
<br/>
<hr />
<div id="faq">
<p>
<div>Question: What is nntpchan?</div>
<div>NNTPCchan is a federated imageboard that spans across several networks including tor, i2p and anonet. There are no central servers so that as long as 1 server is left the forum will continue to function.</div>
</p>
<hr />
<p>
<div>Question: How is this different from *chan? </div>
<div>NNTPChan is by design invulnerable to global censorship. All moderation is local to each server.</div>
</p>
<hr />
<p>
<div>Question: How does moderation work then? </div>
<div>Moderation is done with our special tripcodes (ed25519-sha512 signed posts). Anyone can give moderation suggestions, but that doesn't mean anyone will accept them. Those who trust the actions of a moderator can have their frontend whitelist the moderation actions and have them performed without oversight by another moderator.</div>
</p>
<hr />
<p>
<div>Question: How can I remove content from nntpchan completely? </div>
<div>‾\(._.)/‾ I don't know. You probably can't unless every server agrees to remove the content, even then, nothing prevents someone from reposting it. You can't delete what you post on the internet.</div>
</p>
<hr />
<p>
<div>Question: Do you allow XYZ content? </div>
<div>If it violates USA Law or causes problems with my host, no. Otherwise, yes. <b>All posts on this site are the responsibility of the individual poster and not the administration of this server</b>.</div>
</p>
<hr />
<p>
<div>Question: I found a bug or I have a feature request where do I go? </div>
<div><a href="https://github.com/majestrate/nntpchan/issues">github</a></div>
</p>
<hr />
<p>
<div>Please send any questions to ampernand [|at\] gmail {dot} com with subject starting with "nntpchan question" </div>
</p>
<hr />
</div>
</body>
</html>

View File

@@ -93,7 +93,6 @@ a:visited {
padding: 5px 5px;
margin: 5px 5px;
display: inline-block;
border-radius: 10px;
}
th {
@@ -141,10 +140,51 @@ body {
color: #de04ef;
}
@keyframes psych
{
0% {background-color: red; color: blue; }
10% {background-color: yellow; color: red; }
20% {background-color: blue; color: green; }
30% {background-color: green; color: yellow; }
40% {background-color: red; color: blue; }
50% {background-color: yellow; color: green; }
60% {background-color: blue; color: yellow; }
70% {background-color: green; color: blue; }
80% {background-color: red; color: green; }
90% {background-color: yellow; color: red; }
95% {background-color: blue; color: yellow; }
100% {background-color: green; color: white; }
}
.psy > p {
animation: psych 2s linear infinite;
display: inline-block;
}
.memearrows {
color: green;
}
.redtext {
color: #d50505;
font-weight: bold;
}
.spoiler {
display: inline-block;
}
.spoiler > p {
background: black;
color: black;
}
.spoiler:hover > p {
background: black;
color: white;
}
.intro {
margin-bottom: 0.75em;
}
@@ -159,4 +199,25 @@ body {
border: medium none;
max-width: 300px;
max-height: 200px;
}
pre > p {
margin: 0px 0px;
}
.reply , .post_body > pre , .ukko_thread_header {
padding: 7px 7px;
border-radius: 5px;
box-shadow: 1px 1px 3px black;
}
.post_body > pre {
background: #3f3f3f;
color: #d17600;
}
#faq > div {
margin-left: 20%;
width: 50%;
padding: 10px;
}

View File

@@ -17,9 +17,11 @@
<div class="index-outer">
<div class="index-inner">
<h1> {{frontend}} on nntpchan </h1>
<h2>View the <a href="ukko.html">overboard</a></h2>
<h3>Read the <a href="{{prefix}}static/faq.html">FAQ</a></h3>
<h3>View the <a href="ukko.html">overboard</a></h3>
<h3>We've Had {{totalposts}} Posts Since August 01 2015 </h3>
<h3>Join the <a href="https://i2p.rocks/irc/?channels=overchan&nick=nameless">IRC</a></h3>
<h3>Fork on github: <a href="https://github.com/majestrate/nntpchan/">frontend</a> and <a href="https://github.com/majestrate/srndv2/">core</a></h3>
<h4>We've Had {{totalposts}} Posts Since August 01 2015 </h4>
</div>
<div class="index-inner">
<table id="board_graph">

23
contrib/tools/thumbs.sh Executable file
View File

@@ -0,0 +1,23 @@
#!/usr/bin/env bash
#
# shell script for regenerating thumbnails
#
if [ "$1" == "" ] ; then
echo "usage: $0 webroot_dir"
else
cd $1
echo "regenerate missing thumbs in $(pwd)"
find img/ \
-type f \
-regextype posix-extended \
-iregex '.*\.(png|jpg|gif)$' \
-not -execdir test -f '../thm/{}' \; \
-exec echo 'generating missing thumb for {}' \; \
-exec mogrify \
-define jpeg:size=500x500 \
-thumbnail '250>x250>' \
-path thm/ \
-strip \
'{}' \;
fi