Git-Mirrors/privacyguides.org
1
0
Fork 0
mirror of https://github.com/privacyguides/privacyguides.org.git synced 2024-08-01 08:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
arcadius3d 2017-06-15 21:51:07 -03:00
parent 220bc7149b
commit 912c21cc2c
5 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
img/flags/4x3/za.svg
View File

@ -1,17 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640" version="1">
<defs>
<clipPath id="a">
<path fill-opacity=".67" d="M-71.873-.012h682.68v512.01h-682.68z"/>
</clipPath>
</defs>
<g clip-path="url(#a)" transform="translate(67.379 .011) scale(.93748)">
<g fill-rule="evenodd" stroke-width="1pt">
<path d="M-71.878 407.837V104.428l225.832 151.627-225.832 151.793z"/>
<path d="M82.217 512.121l253.538-170.644h360.372v170.644H82.217z" fill="#00c"/>
<path d="M65.917.062l630.19.013v170.672H335.735S69.295-1.626 65.917.062z" fill="red"/>
<path d="M-71.878 64.075v40.329L153.954 256.03-71.878 407.823v40.327l284.44-192.12-284.44-191.955z" fill="#fc0"/>
<path d="M-71.878 64.075V.062h94.891l301.313 203.88h371.778v104.261H324.326L23.013 512.053h-94.89V448.15l284.439-192.12-284.44-191.955z" fill="#093"/>
<path d="M23.013.062h59.194l253.538 170.673h360.372v33.207H324.339L23.025.062zM23.013 512.121h59.194l253.538-170.644h360.372v-33.206H324.339L23.025 512.12z" fill="#fff"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
img/tools/LineageOS.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
img/tools/Simplenote.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
img/tools/StandardNotes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

45
index.html
View File

@ -1180,7 +1180,7 @@
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
<td data-value="10000">10 GB</td>
<td data-value="60">$ 59.95</td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="0"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="0"><span class="label label-success">Yes</span></td>
</tr>
@ -1460,8 +1460,7 @@
</li>
<li>
<a href="https://www.ixquick.eu/">ixquick.eu</a> - Returns the top ten results from multiple search engines. Based in the
USA and the Netherlands.
<a href="https://www.ixquick.eu/">ixquick.eu</a> - Returns the top results from multiple search engines. Based in the Netherlands.
</li>
</ul>
@ -1996,8 +1995,8 @@
or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues
raised by the initial TrueCrypt code audit have been addressed.</p>
<p>
<a href="https://veracrypt.codeplex.com/">
<button type="button" class="btn btn-success">Website: veracrypt.codeplex.com</button>
<a href="https://veracrypt.fr/">
<button type="button" class="btn btn-success">Website: veracrypt.fr</button>
</a>
</p>
<p>OS: Windows, Mac, Linux.</p>
@ -2343,22 +2342,22 @@
</div>
</div>
<div class="col-sm-4">
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">Simplenote</h3>
</div>
<div class="panel-body">
<p><img src="img/tools/Simplenote.png" width="120" height="120" alt="Simplenote" align="right" style="margin-left:5px;">Simplenote is an easy way to keep notes, lists, ideas and more. Your notes stay in sync with all of your devices for free. The Simplenote experience is all about speed and efficiency. Open it, write some thoughts, and you're done. <a href="https://simplenote.com/help/#encryption">Does not support client-side encryption.</a></p>
<p>
<a href="https://simplenote.com/">
<button type="button" class="btn btn-warning">Website: simplenote.com</button>
</a>
</p>
<p>OS: Windows, Mac, Linux, Android, iOS.</p>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">Standard Notes</h3>
</div>
<div class="panel-body">
<p><img src="img/tools/StandardNotes.png" alt="StandardNotes" align="right" style="margin-left:5px;">Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors.<p>
<p>
<a href="https://standardnotes.org/">
<button type="button" class="btn btn-warning">Website: standardnotes.org</button>
</a>
</p>
<p>OS: Windows, Mac, Linux, iOS, Android, Web.</p>
</div>
</div>
</div>
</div>
@ -2626,8 +2625,8 @@
<h3 class="panel-title">LineageOS</h3>
</div>
<div class="panel-body">
<p><img src="img/tools/LineageOS.png" alt="LineageOS" align="right" style="margin-left:5px;">LineageOS is the descendant of the discontinued CyanogenMod. It is a free and open-source operating system for smartphones and tablets, based on
the oficcial releases of Android by Google.</p>
<p><img src="img/tools/LineageOS.png" alt="LineageOS" align="right" style="margin-left:5px;">LineageOS is a free and open-source operating system for smartphones and tablets, based on
the oficcial releases of Android by Google. It is the continuation of the CyanogenMod project.</p>
<p>
<a href="https://www.lineageos.org/">
<button type="button" class="btn btn-success">Website: lineageos.org</button>