Merge branch 'less'

pull/1/head
yflory 8 years ago
commit 07434eb4c4

@ -137,6 +137,12 @@ tr {
border: 2px solid #a1f4bf; border: 2px solid #a1f4bf;
color: #46E981; color: #46E981;
} }
.create {
display: none;
}
.action {
display: inline-block;
}
.buttons { .buttons {
margin-bottom: 50px; margin-bottom: 50px;
margin-top: 20px; margin-top: 20px;
@ -148,12 +154,6 @@ tr {
margin-bottom: 12px; margin-bottom: 12px;
white-space: nowrap; white-space: nowrap;
} }
.create {
display: none;
}
.action {
display: inline-block;
}
/* Tables */ /* Tables */
table { table {
border-collapse: collapse; border-collapse: collapse;

@ -28,7 +28,6 @@
})(); })();
} }
</script> </script>
<script src="/common/cryptpad-commons.js"></script>
<!-- End Piwik Code --> <!-- End Piwik Code -->

@ -166,6 +166,12 @@ p, pre, td, a, table, tr {
color: @cp-green; color: @cp-green;
} }
} }
.create {
display: none;
}
.action {
display: inline-block;
}
.buttons { .buttons {
margin-bottom: 50px; margin-bottom: 50px;
margin-top: 20px; margin-top: 20px;
@ -180,7 +186,6 @@ p, pre, td, a, table, tr {
margin-top: 2 * 6px; margin-top: 2 * 6px;
margin-bottom: 2 * 6px; margin-bottom: 2 * 6px;
white-space: nowrap; white-space: nowrap;
display: inline-block;
} }
/* Tables */ /* Tables */

@ -3,47 +3,45 @@
<h1>Unity is Strength - Collaboration is Key</h1> <h1>Unity is Strength - Collaboration is Key</h1>
</center> </center>
<p>CryptPad is the <strong>zero knowledge</strong> realtime collaborative editor. Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA. The secret encryption key is stored in the URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.</p> <p data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
<p>This project uses the <a href="http://ckeditor.com/">CKEditor</a> Visual Editor, <a href="https://codemirror.net/">CodeMirror</a>, and the <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> realtime engine.</p> <p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p>
<h2 id="howitworks">How It Works</h2> <h2 id="howitworks" data-localization="main_howitworks"></h2>
<p>CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a Nakamoto Blockchain, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.</p> <p data-localization="main_howitworks_p1"><!-- Operational transform, Nakamoto blockchain, server kept unaware of the content--></p>
<h2 id="about-us">About</h2> <h2 id="about-us" data-localization="main_about"></h2>
<p>You can read more about our <a href="/privacy.html" title="">privacy policy</a> and <a href="/terms.html">terms of service</a>.</p> <p data-localization="main_about_p1"><!-- Privacy policy, terms of service --></p>
<p>If you have any questions or comments, you can <a href="https://twitter.com/cryptpad">tweet us</a>, open an issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">on github</a>, come say hi on irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), or <a href="mailto:sftfbsdiAyxjlj/dpn">send us an email</a>.</p> <p data-localization="main_about_p2"><!-- Contact us--></p>
<center> <center>
<noscript> <noscript>
<p> <p data-localization="main_oops">
<strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <!-- JS required -->
<strong>really</strong> required.
</p> </p>
</noscript> </noscript>
<h5 id="tryit">Try it out!</h5> <h5 id="tryit" data-localization="tryIt"></h5>
<table class="recent scroll" style="display:none"> <table class="recent scroll" style="display:none">
<tbody> <tbody>
<tr> <tr>
<th>Type</th> <th data-localization="table_type"></th>
<th>Link</th> <th data-localization="table_link"></th>
<th>Created</th> <th data-localization="table_created"></th>
<th>Last Accessed</th> <th data-localization="table_last"></th>
<th class="table-refresh" title="refresh list"> <th></th>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 861.143 861.144" style="enable-background:new 0 0 861.143 861.144;" xml:space="preserve"><path d="M803.661,613.847c21.129-49.956,31.842-102.991,31.842-157.634c0-46.664-7.883-92.431-23.43-136.031 c-15.025-42.134-36.846-81.294-64.859-116.393c-27.734-34.751-60.746-64.539-98.117-88.534 c-38.072-24.445-79.621-42.192-123.492-52.748c-28.191-6.782-56.543,10.571-63.326,38.761s10.572,56.542,38.762,63.325 c64.291,15.47,122.572,52.651,164.109,104.694c20.75,26.001,36.908,54.99,48.023,86.162c11.5,32.249,17.332,66.151,17.332,100.764 c0,80.114-31.197,155.435-87.848,212.083c-56.65,56.649-131.971,87.848-212.084,87.848c-80.114,0-155.434-31.198-212.083-87.849 c-56.65-56.648-87.848-131.969-87.848-212.083c0-59.197,17.208-116.435,49.763-165.521c28.053-42.3,66.007-76.562,110.547-100.007 v58.027c0,28.995,23.505,52.5,52.5,52.5s52.5-23.505,52.5-52.5V52.5c0-28.995-23.505-52.5-52.5-52.5H144.567 c-28.995,0-52.5,23.505-52.5,52.5c0,28.995,23.505,52.5,52.5,52.5h84.328C174.456,136.276,127.939,179.822,92.9,232.655 c-44.001,66.346-67.259,143.65-67.259,223.557c0,54.643,10.714,107.679,31.843,157.634c20.398,48.225,49.587,91.524,86.759,128.695 c37.171,37.171,80.471,66.361,128.696,86.759c49.956,21.13,102.991,31.844,157.634,31.844c54.644,0,107.677-10.714,157.634-31.844 c48.225-20.397,91.523-49.587,128.695-86.759C754.073,705.371,783.262,662.071,803.661,613.847z"/></svg>
</th> <!-- remove column -->
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="buttons" class="buttons"> <div id="buttons" class="buttons">
<a id="create-pad" class="button create" href="/pad/">CREATE NEW WYSIWYG PAD</a> <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>
<a id="create-code" class="button create" href="/code/">CREATE NEW CODE PAD</a> <a id="create-code" class="button create" href="/code/" data-localization="button_newcode"></a>
<a id="create-poll" class="button create" href="/poll/">CREATE NEW POLL</a> <a id="create-poll" class="button create" href="/poll/" data-localization="button_newpoll"></a>
<a id="create-slide" class="button create" href="/slide/" data-localization="button_newslide"></a>
</div> </div>
</center> </center>

@ -1,41 +1,32 @@
<center> <center>
<img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /> <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
<h1>Cryptpad Privacy Policy</h1> <h1 data-localization="policy_title"></h1>
</center> </center>
<h2>What we know about you</h2> <h2 data-localization="policy_whatweknow"></h2>
<p>As an application that is hosted on the web, Cryptpad has access to metadata exposed by the HTTP protocol. <p data-localization="policy_whatweknow_p1"><!-- HTTP headers, IP address--></p>
This includes your IP address, and various other HTTP headers that can be used to identify your particular browser. <p data-localization="policy_whatweknow_p2"><!-- Piwik --></p>
You can see what information your browser is sharing by visiting <a target="_blank" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="what http headers is my browser sending">WhatIsMyBrowser.com</a>.
</p>
<p>We use <a href="https://piwik.org/" target="_blank" title="open source analytics platform">Piwik</a>, an open source analytics platform, to learn more about our users.
Piwik tells us about how you found Cryptpad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter.
We also learn when you visit, what links you click while on our informational pages, and how long you stay on a particular page.
</p>
<p> <p>
<strong>These analytics tools are only used on informational pages. We do not collect any information about your usage of our zero-knowledge applications.</strong> <strong data-localization="policy_whatweknow_p3"><!-- Piwik disabled in pads --></strong>
</p> </p>
<h2>How we use what we learn</h2> <h2 data-localization="policy_howweuse"></h2>
<p>We use this information to make better decisions about promoting Cryptpad, by evaluating which of our past efforts were successful. <p data-localization="policy_howweuse_p1"><!-- Referrer : promoting--></p>
Information about your location lets us know whether we should consider providing better support for languages other than English. <p data-localization="policy_howweuse_p2"><!-- Browser : prioritizing new features--></p>
</p>
<p>Information about your browser (whether it's a desktop or mobile operating system) helps us make decisions when prioritizing feature improvements.
Our development team is small, and we try to make choices that will improve as many users' experience as possible.</p>
<h2>What we tell others about you</h2> <h2 data-localization="policy_whatwetell"></h2>
<p>We do not furnish to third parties the information that we gather or that you provide to us unless we are legally required to do so.</p> <p data-localization="policy_whatwetell_p1"></p>
<h2>Links to other sites</h2> <h2 data-localization="policy_links"></h2>
<p>This site contains links to other sites, including those produced by other organizations. We are not responsible for the privacy practices or the contents of any outside sites. As a general rule, links to outside sites are launched in a new browser window, to make clear that you are leaving Cryptpad.fr.</p> <p data-localization="policy_links_p1"></p>
<h2>Advertisement</h2> <h2 data-localization="policy_ads"></h2>
<p>We do not display any online advertising, though we may link to the bodies which are financing our research.</p> <p data-localization="policy_ads_p1"></p>
<h2>Choices you have</h2> <h2 data-localization="policy_choices"></h2>
<p>Our code is open source, so you always have the option of hosting your own instance of Cryptpad.</p> <p data-localization="policy_choices_open"></p>
<p>If you want to use our hosted instance, but don't want to expose your IP address, you can protect your IP using the <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank">Tor browser bundle</a>, or a <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank">VPN</a>.</p> <p data-localization="policy_choices_vpn"></p>
<p>If you just want to block our analytics platform, you can use adblocking tools like <a href="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank">Privacy Badger</a>.</p> <p data-localization="policy_choices_ads"></p>
<br /> <br />

@ -1,12 +1,11 @@
<center> <center>
<img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /> <img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" />
<h1>Cryptpad Terms of Service</h1> <h1 data-localization="tos_title"></h1>
</center> </center>
<p>Please don't be malicious, abusive, or do anything illegal.</p> <p data-localization="tos_legal"></p>
<p>We hope you find this service useful, but availability or performance cannot be guaranteed. Please export your data regularly.</p> <p data-localization="tos_availability"></p>
<p>Cryptpad documents can be read or modified by anyone who can guess or otherwise obtain the document's fragment identifier. <p data-localization="tos_e2ee"></p>
We recommend that you use end-to-end-encrypted (e2ee) messaging technology to share URLs, and assume no liability in the event that such a URL is leaked.</p> <p data-localization="tos_logs"></p>
<p>Metadata provided by your browser to the server may be logged for the purpose of maintaining the service.</p> <p data-localization="tos_3rdparties"></p>
<p>We do not provide individualized data to third parties unless required to by law.</p>

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title> <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/> <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
<link rel="stylesheet" type="text/css" href="customize/main.css" /> <link rel="stylesheet" type="text/css" href="customize/main.css" />
<link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/> <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>

@ -65,14 +65,6 @@
padding-left: 5px; padding-left: 5px;
} }
} }
.cryptpad-changeName {
float: left;
cursor: pointer;
button {
padding: 0;
margin-right: 5px;
}
}
.cryptpad-toolbar-leftside { .cryptpad-toolbar-leftside {
float: left; float: left;
@ -91,4 +83,12 @@
.cryptpad-spinner { .cryptpad-spinner {
float: left; float: left;
} }
.cryptpad-readonly {
margin-right: 20px;
font-weight: bold;
text-transform: uppercase;
}
.cryptpad-toolbar-username {
font-style: italic;
}

@ -28,7 +28,6 @@
})(); })();
} }
</script> </script>
<script src="/common/cryptpad-commons.js"></script>
<!-- End Piwik Code --> <!-- End Piwik Code -->

@ -82,4 +82,4 @@
} }
.cryptpad-toolbar-username { .cryptpad-toolbar-username {
font-style: italic; font-style: italic;
}; }

Loading…
Cancel
Save