Merge remote-tracking branch 'upstream/master'

5 files changed, 324 insertions, 0 deletions

diff --git a/assets/hashlogo-lighttext.png b/assets/hashlogo-lighttext.png
new file mode 100644
index 000000000..7f94ccdd9
--- /dev/null
+++ b/assets/hashlogo-lighttext.png
diff --git a/assets/hashlogo.png b/assets/hashlogo.png
new file mode 100644
index 000000000..99ef21328
--- /dev/null
+++ b/assets/hashlogo.png
diff --git a/assets/hashlogo.svg b/assets/hashlogo.svg
new file mode 100644
index 000000000..903a5c894
--- /dev/null
+++ b/assets/hashlogo.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="215.94055"
+   height="50"
+   id="svg3877"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="hashlogo.svg"
+   inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/redmatrix/assets/hashlogo2.png"
+   inkscape:export-xdpi="156.42857"
+   inkscape:export-ydpi="156.42857">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.7759502"
+     inkscape:cx="84.10176"
+     inkscape:cy="24.800256"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1533"
+     inkscape:window-height="656"
+     inkscape:window-x="49"
+     inkscape:window-y="171"
+     inkscape:window-maximized="0"
+     units="px"
+     fit-margin-top="4"
+     fit-margin-left="4"
+     fit-margin-right="4"
+     fit-margin-bottom="4" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-240.69473,-715.93361)">
+    <path
+       transform="matrix(0.94,0,0,0.9075862,138.86175,379.85869)"
+       sodipodi:type="arc"
+       id="path3028-4-5-3"
+       sodipodi:cx="195.74467"
+       sodipodi:cy="397.84091"
+       sodipodi:rx="22.340425"
+       sodipodi:ry="23.138298"
+       d="m 218.0851,397.84091 c 0,12.77893 -10.00215,23.1383 -22.34043,23.1383 -12.33827,0 -22.34042,-10.35937 -22.34042,-23.1383 0,-12.77893 10.00215,-23.1383 22.34042,-23.1383 12.33828,0 22.34043,10.35937 22.34043,23.1383 z"
+       style="fill:#c60032;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path2998"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3c3c3c;fill-opacity:1;stroke:none;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+       d="m 248.69473,755.61224 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-12.24 c 0,-2.51999 1.32001,-3.88 3.8,-3.88 0.76,0 1.64,0.44 1.64,-0.6 l 0,-3 c 0,-0.56 -0.16,-0.6 -0.72,-0.6 -1.72,0.04 -3.72,10e-6 -5.44,2.64 l -0.08,0 -0.4,-1.52 c -0.24,-0.52 -0.24,-0.8 -0.8,-0.8 l -2,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,19.2 c 0,0.56 0.24,0.8 0.8,0.8 l 3.2,0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3000"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3c3c3c;fill-opacity:1;stroke:none;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+       d="m 272.47473,751.81224 c -0.12,-0.16 -0.24,-0.32 -1.04,-0.08 -1.64,0.52 -3.16,1 -4.72,1 -3.51999,0 -4.72,-2.48 -5.04,-5.84 l 8.2,0 c 3.32,0 4.36,-0.92 4.36,-4 0,-5.79999 -3.72,-8.6 -8.56,-8.6 -6.47999,0 -8.88,4.96001 -8.88,11.12 0,5.6 2.00001,10.68 9.4,10.68 3.4,0 6.32,-1.08 7.08,-1.96 0.32,-0.36 0.28,-0.68 0.04,-1.04 l -0.84,-1.28 m -10.8,-8.28 c 0.24,-3.15999 1.28001,-5.88 4.2,-5.88 2.12,0 3.52,2.16001 3.52,4.52 0,1.2 -0.32,1.36 -1.56,1.36 l -6.16,0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3002"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3c3c3c;fill-opacity:1;stroke:none;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+       d="m 296.25973,755.61224 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-28 c 0,-0.56 -0.24,-0.8 -0.8,-0.8 l -3.2,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,10.44 -0.08,0 c -1,-1.51999 -2.76,-2.92 -6.16,-2.92 -4.63999,0 -8.6,2.64001 -8.6,10.96 0,8.24 3.92001,10.84 8.48,10.84 3.04,0 5.44,-0.92 7.08,-3 l 0.08,0 0.4,1.68 c 0.12,0.56 0.24,0.8 0.8,0.8 l 2,0 m -9.52,-2.84 c -2.91999,0 -4.52,-1.44 -4.52,-7.48 0,-6.23999 1.72001,-7.6 4.48,-7.6 3.52,0 5.56,2.16001 5.56,7.6 0,5.32 -1.96,7.48 -5.52,7.48" />
+    <g
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3c3c3c;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text3016">
+      <path
+         d="m 375.14875,755.65222 c 0.52,0 0.76,-0.24 0.76,-0.8 l 0,-12.64 c 0,-4.99999 -3.28001,-7.84 -7.24,-7.84 -1.92,0 -4.04,1.2 -5.12,3.28 -1.28,-2.12 -3.44,-3.28 -5.92,-3.28 -1.72,0 -3.72,1.04 -4.52,2.92 l -0.08,0 -0.4,-1.64 c -0.12,-0.56 -0.24,-0.8 -0.8,-0.8 l -2,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,19.2 c 0,0.56 0.24,0.8 0.8,0.8 l 3.2,0 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-10.88 c 0,-4.11999 1.12,-6.24 3.4,-6.24 2.12,0 2.84,2.76 2.84,5.84 l 0,11.28 c 0,0.56 0.24,0.8 0.76,0.8 l 3.28,0 c 0.52,0 0.76,-0.24 0.76,-0.8 l 0,-11.16 c 0.04,-3.91999 1.2,-5.96 3.4,-5.96 2.12,0 2.84,2.76 2.84,5.84 l 0,11.28 c 0,0.56 0.24,0.8 0.76,0.8 l 3.28,0"
+         style="font-variant:normal;font-stretch:normal;fill:#3c3c3c;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+         id="path3011"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 396.04812,755.65222 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-9.84 c 0,-5.71999 -1.76,-10.68 -8.68,-10.68 -3.19999,0 -6.12,1.08 -6.92,1.96 -0.32,0.36 -0.28,0.68 -0.04,1.04 l 0.84,1.28 c 0.12,0.16 0.28,0.32 1.04,0.08 1.8,-0.56 3.24,-1 4.52,-1 3.32,0 4.16,3 4.36,4.68 l -4.12,0 c -4.55999,0 -8.36,1.36001 -8.36,6.52 0,4.92 3.48001,7.24 7.52,7.24 2.68,0 4.72,-1 5.76,-2.92 l 0.08,0 0.4,1.64 c 0.12,0.56 0.24,0.8 0.8,0.8 l 2,0 m -4,-8.76 c 0,4.08 -1.48,5.88 -3.92,5.88 -2.83999,0 -3.8,-2.4 -3.8,-4 0,-1.92 1.4,-3.04 3.52,-3.04 l 4.2,0 0,1.16"
+         style="font-variant:normal;font-stretch:normal;fill:#3c3c3c;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+         id="path3013"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 408.715,755.65222 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-1.76 c 0,-0.56 -0.24,-0.8 -0.8,-0.8 l -0.28,0 c -0.92,0 -1.92,-0.8 -1.92,-2.76 l 0,-11.52 2.52,0 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-1.56 c 0,-0.56 -0.24,-0.8 -0.8,-0.8 l -2.52,0 0,-4.28 c 0,-0.56 -0.28,-1 -0.8,-0.8 l -3.2,1.2 c -0.52,0.2 -0.8,0.24 -0.8,0.8 l 0,3.08 -2.08,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,1.56 c 0,0.56 0.24,0.8 0.8,0.8 l 2.08,0 0,11.4 c 0,4.2 1.92,6.24 5.52,6.24 l 1.48,0"
+         style="font-variant:normal;font-stretch:normal;fill:#3c3c3c;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+         id="path3015"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 417.01312,755.65222 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-12.24 c 0,-2.52 1.32001,-3.88 3.8,-3.88 0.76,0 1.64,0.44 1.64,-0.6 l 0,-3 c 0,-0.56 -0.16,-0.6 -0.72,-0.6 -1.72,0.04 -3.72,0 -5.44,2.64 l -0.08,0 -0.4,-1.52 c -0.24,-0.52 -0.24,-0.8 -0.8,-0.8 l -2,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,19.2 c 0,0.56 0.24,0.8 0.8,0.8 l 3.2,0"
+         style="font-variant:normal;font-stretch:normal;fill:#3c3c3c;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+         id="path3017"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 430.06,730.85222 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-3.2 c 0,-0.56 -0.24,-0.8 -0.8,-0.8 l -3.2,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,3.2 c 0,0.56 0.24,0.8 0.8,0.8 l 3.2,0 m 0,24.8 c 0.56,0 0.8,-0.24 0.8,-0.8 l 0,-19.2 c 0,-0.56 -0.24,-0.8 -0.8,-0.8 l -3.2,0 c -0.56,0 -0.8,0.24 -0.8,0.8 l 0,19.2 c 0,0.56 0.24,0.8 0.8,0.8 l 3.2,0"
+         style="font-variant:normal;font-stretch:normal;fill:#3c3c3c;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+         id="path3019"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 452.12812,755.65222 c 0.56,0 0.64,-0.2 0.32,-0.64 l -6.72,-10 6.4,-9.52 c 0.32,-0.44 0.32,-0.64 -0.32,-0.64 l -4.16,0 c -0.52,0 -0.96,0.2 -1.24,0.68 l -3.44,6.8 -3.24,-6.8 c -0.28,-0.48 -0.64,-0.68 -1.2,-0.68 l -4.4,0 c -0.56,0 -0.64,0.2 -0.32,0.64 l 6.4,9.52 -6.72,10 c -0.32,0.44 -0.16,0.64 0.32,0.64 l 4.16,0 c 0.52,0 0.96,-0.2 1.24,-0.68 l 3.76,-7.08 3.56,7.08 c 0.28,0.48 0.64,0.68 1.2,0.68 l 4.4,0"
+         style="font-variant:normal;font-stretch:normal;fill:#3c3c3c;font-family:Designosaur;-inkscape-font-specification:Designosaur"
+         id="path3021"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       style="font-size:46px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text3003-0-4-0">
+      <path
+         d="m 322.85053,756.03406 4.7355,0 1.3079,-7.9827 4.8708,0 0,-4.4649 -4.1492,0 1.0373,-6.4944 4.9159,0 0,-4.4649 -4.1492,0 1.1275,-7.0356 -4.7355,0 -1.1275,7.0356 -5.1865,0 1.1275,-7.0356 -4.7355,0 -1.1275,7.0356 -5.0963,0 0,4.4649 4.3296,0 -1.0373,6.4944 -5.0963,0 0,4.4649 4.3747,0 -1.3079,7.9827 4.7355,0 1.3079,-7.9827 5.1865,0 -1.3079,7.9827 m 2.0295,-12.4476 -5.1865,0 1.0373,-6.4944 5.1865,0 -1.0373,6.4944"
+         style="font-size:45.09999847px;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;font-family:generic;-inkscape-font-specification:generic Bold"
+         id="path3008"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/hashlogo.xcf b/assets/hashlogo.xcf
new file mode 100644
index 000000000..b7aaa63f8
--- /dev/null
+++ b/assets/hashlogo.xcf
diff --git a/assets/home.html b/assets/home.html
new file mode 100644
index 000000000..3fe3d02d7
--- /dev/null
+++ b/assets/home.html
@@ -0,0 +1,192 @@
+<style>
+section { position: relative; margin-left: 15px;} 
+nav { z-index: 9999; position: fixed; width: 100%; top: 0; left: 0; } 
+header { z-index: 10000; }
+
+.tr {
+  clear: both;
+}
+.tab {
+  float: left;
+  width: 25px;
+}
+.td {
+  float: left;
+  width: 200px;
+  font-size: 1.8em;
+  margin-bottom: 5px;
+  margin-right: 25px;
+	color: #808080;
+
+}
+
+body::after {
+	content: '';
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	position: absolute;
+	opacity: 0.5;
+	z-index: -1;
+}
+
+</style>
+
+<script>
+
+var terms = new Array(
+"Internet-scale Privacy",
+"Social Networking",
+"Single Sign-On",
+"Photo Albums",
+"Decentralised",
+"Cloud Storage",
+"Own Your Content",
+"Blogging",
+"End-to-end Encryption",
+"Chatrooms",
+"Shareable Apps",
+"Cross-Site Access Control",
+"Unsend Private Mail",
+"Webpage Creation",
+"Content Management",
+"Message Expiration",
+"Games and Utilities",
+"Unincorporated",
+"Forums",
+"Like + Dislike",
+"Share Anything Digital",
+"Communications",
+"Identity-Aware Content",
+"Pseudonyms",
+"Multiple Identities",
+"No Advertising",
+"Rich Text Post/Comment",
+"Event Calendar",
+"Bookmarking",
+"Community Tagging",
+"Mirrored Directory",
+"Nomadic Identity",
+"Derivative Channels",
+"Customised Encryption",
+"Multiple Profiles",
+"Privacy Groups",
+"File Sharing",
+"MIT license",
+"Autonomy",
+"Affinity Filtering",
+"Friend Suggestions",
+"Cross-Site Auth",
+"Themes",
+"Plugins",
+"External API",
+"3rd Party Apps",
+"Open Source",
+null
+);
+
+var r = 0;
+var g = 0;
+var b = 0;
+
+var speed = 3;
+var delay = 450;
+
+var timer = null;
+var holdid = 0;
+var element = 'word-flasher';
+var custom = '';
+var seq = 0;
+var nindex = 0;
+var firstTime = 1;
+var curr = null;
+
+function update_element() {
+
+	if(firstTime) {
+		firstTime = 0;
+		fadeout();
+		return;
+	}
+	curr = terms[nindex];
+	nindex ++;
+	if(terms[nindex] == null)
+		nindex = 0;
+
+	var id = document.getElementById(element);
+	id.innerHTML = curr;
+	timer = setTimeout('fadein();',3);
+}
+
+function fadeout() {
+
+  var id = document.getElementById(element);
+  r = (((r + speed) < 255) ? r + speed : 255);
+  g = (((g + speed) < 255) ? g + speed : 255);
+  b = (((b + speed) < 255) ? b + speed : 255);
+
+  if((r != 255) && (g != 255) && (b != 255)) {
+    timer = setTimeout('fadeout();',5);
+  }
+  else {
+	    update_element();
+  }
+
+  id.style.color = "rgb(" + r + "," + g + "," + b + ")";
+}
+
+function fadein() {
+  var id = document.getElementById(element);
+  r = (((r - speed) > 0) ? r - speed : 0);
+  g = (((g - speed) > 0) ? g - speed : 0);
+  b = (((b - speed) > 0) ? b - speed : 0);
+
+  if(r && g && b) {
+    timer = setTimeout('fadein();',5);
+  }
+  else {
+    timer = setTimeout('fadeout();',delay);
+  }
+
+  id.style.color = "rgb(" + r + "," + g + "," + b + ")";
+}
+
+
+$(document).ready(function() {
+	timer = setTimeout('update_element();',2000);
+});
+
+
+</script>
+
+
+<div style="margin-top: 50px;"></div>
+
+<center>
+<img style="width: 330px; margin-top: 30px; margin-bottom: 30px;" src="assets/hashlogo.png" >
+<div id="word-flasher" style="font-size: 3.0em; font-weight: bold; margin-bottom: 30px;">&quot;The Network&quot;</div>
+<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
+The RedMatrix (aka "<span style="color: #c60032;">red</span>") is an open source webapp providing a complete <strong>decentralised</strong> publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, shareable apps) with enough features to make your head spin.
+</div>
+<br />
+<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
+What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. This ties all RedMatrix sites and channels together into a single super-network where the boundaries between different websites are blurred or seemingly non-existent; where "who you are" has nothing to do with "what computer you're connected to", and where website content can adapt itself according to who is viewing it.  
+</div>
+<br />
+<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
+Warning: After experiencing magic authentication and nomadic identity, you may find it disconcerting and a bit "primitive" to go back to the old internet. You shouldn't need hundreds of different passwords to use the web ... or be totally isolated from your friends and family because a server or router in another country is having "<em>issues</em>".
+</div>
+<br />
+<div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
+For the average person, the biggest advantage of decentralised identity is that you decide who you want to share your stuff with, and if somebody isn't on your list, they're not going to see it. It's all under your control (we're big on privacy). Use the RedMatrix as a social network or a business website or for personal cloud storage or media publishing - or any number of other uses; limited only by your imagination.<br />
+</div>
+<br />
+<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - &quot;The Network&quot;</strong></div>
+<div style="font-size: 1.4em;"><a href="pubsites" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Sign up now!</a></div>
+
+
+<div style="margin-top: 15px; margin-bottom: 15px;"><a href="pubsites">Public Sites</a> | <a href="https://redmatrix.me">Project Home</a> | <a href="https://github.com/friendica/red">Code</a> | <a href="https://zothub.com/channel/one">Developers</a></div></center>
+