Commit edae8de8 authored by spf's avatar spf
Browse files

Merge branch 'english-framapic' into 'master'

Framapic in english

See merge request !70
parents 5dea0c02 71b81fc7
......@@ -17,6 +17,13 @@
<p><b>Mastodon</b></p>
</a>
</div>
<div class="col-md-3 col-sm-6">
<a href="lutim/index.html" class="btn btn-lg btn-block btn-default">
<p><i class="fa fa-2x fa-photo"></p>
<p><b class="violet">Frama</b><b class="vert">pic</b></p>
<p><b>Lutim</b></p>
</a>
</div>
<div class="col-md-3 col-sm-6">
<a href="diaspora/index.html" class="btn btn-lg btn-block btn-default">
<p><i class="fa fa-2x fa-diaspora"></p>
......
......@@ -11,6 +11,8 @@
* [Getting Started](mastodon/User-guide.md)
* [Privacy, Safety and Security](mastodon/User-guide.html#privacy-safety-and-security)
* [Framapic](lutim/README.md)
* [Framasphère / diaspora](diaspora/README.md)
* [1 - Signing up](diaspora/1-sign_up.md)
* [2 - Interface](diaspora/2-interface.md)
......
# Framapic
[Framapic](https://framapic.org) is a free and open source service which allows you to share pictures in a secure and confidential way.
1. Paste the image you want to share.
2. If needed, define the retention policy.
3. You can then share the link you are given with other people for them to see the picture.
Your pictures are encrypted and stored on our servers. We cannot see the content of your files nor decrypt them.
This service is based on a free software: [Lutim](https://lut.im/).
Thanks to a new feature added by its developer, [Framapic](https://framapic.org) now allows you to easily create an image gallery! Find out how in our [example](galerie.md).
## Video Tutorial
<div class="text-center">
<p><video controls="controls" preload="none" poster="https://framatube.org/images/media/989l.jpg" height="340" width="570">
<source src="https://framatube.org/blip/framapic.mp4" type="video/mp4">
<source src="https://framatube.org/blip/framapic.webm" type="video/webm">
</video></p>
<p><a href="https://framatube.org/blip/framapic.webm">webm format</a></p>
</div>
Tutorial made by [arpinux](http://arpinux.org/), *landscape architect* of GNU/Linux beginners linux distribution [HandyLinux](https://handylinux.org/).
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment