Merge branch 'master' into patch-2

This commit is contained in:
tleb 2018-07-14 11:23:17 +02:00 committed by GitHub
commit e1a147cef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions

View File

@ -30,7 +30,6 @@
## Documentation ## Documentation
* [What I wish I knew before joining Mastodon](https://hackernoon.com/what-i-wish-i-knew-before-joining-mastodon-7a17e7f12a2b) - Introduction to Mastodon. * [What I wish I knew before joining Mastodon](https://hackernoon.com/what-i-wish-i-knew-before-joining-mastodon-7a17e7f12a2b) - Introduction to Mastodon.
* [Mastodon tutorial](http://cassolotl.tumblr.com/post/161825902540) - Quick Mastodon tutorial.
* [Wiki](https://en.mstdn.wiki/Main_Page) - The Mastodon Community Wiki. * [Wiki](https://en.mstdn.wiki/Main_Page) - The Mastodon Community Wiki.
* [API overview](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md) * [API overview](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md)
@ -40,13 +39,14 @@
* [TootyFruity](https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258) - Android app for Mastodon. * [TootyFruity](https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258) - Android app for Mastodon.
* [Twidere](https://f-droid.org/packages/org.mariotaku.twidere/) - Android app for Twitter, GNU Social and Mastodon. * [Twidere](https://f-droid.org/packages/org.mariotaku.twidere/) - Android app for Twitter, GNU Social and Mastodon.
* [Tooty](https://github.com/n1k0/tooty) - Experimental multi-account Mastodon Web client (Elm). * [Tooty](https://github.com/n1k0/tooty) - Experimental multi-account Mastodon Web client (Elm).
* [Mustor](https://itunes.apple.com/app/id1229531204) - iOS app for Mastodon.
* [toot](https://github.com/ihabunek/toot) - Mastodon CLI client (Python). * [toot](https://github.com/ihabunek/toot) - Mastodon CLI client (Python).
* [madonctl](https://github.com/McKael/madonctl) - Mastodon CLI client (Go). * [madonctl](https://github.com/McKael/madonctl) - Mastodon CLI client (Go).
* [naumanni](https://github.com/naumanni/naumanni) - Web user interface specially designed for Mastodon. * [naumanni](https://github.com/naumanni/naumanni) - Web user interface specially designed for Mastodon.
* [Tooter](https://github.com/dysk0/harbour-tooter) - Native client for SailfishOS. * [Tooter](https://github.com/dysk0/harbour-tooter) - Native client for SailfishOS.
* [Tootdon](http://tootdon.club) - Fully featured client for iOS and Android. * [Tootdon](http://tootdon.club) - Fully featured client for iOS and Android.
* [Mastalab](https://github.com/stom79/mastalab) - Android client. * [Mastalab](https://github.com/stom79/mastalab) - Android client.
* [Pinafore](https://github.com/nolanlawson/pinafore) - An alternative web client for Mastodon, focused on speed and simplicity.
* [Brutaldon](https://github.com/jfmcbrayer/brutaldon) - Brutaldon is a brutalist, Web 1.0 web interface for Mastodon.
## Tools ## Tools
@ -57,6 +57,7 @@
* [Mastodon Network Monitoring (MNM)](https://dashboards.mnm.social/) - Track and display browsable stats about the Mastodon network. * [Mastodon Network Monitoring (MNM)](https://dashboards.mnm.social/) - Track and display browsable stats about the Mastodon network.
* [Last](https://framagit.org/luc/last) - Aggregate toots on a web page providing Atom feed and an epub (Perl). * [Last](https://framagit.org/luc/last) - Aggregate toots on a web page providing Atom feed and an epub (Perl).
* [Mastodon Tags Explorer](https://mastodon-tags-explorer.hcxp.co/tags) - Explore what's currently trending in Mastodon network. * [Mastodon Tags Explorer](https://mastodon-tags-explorer.hcxp.co/tags) - Explore what's currently trending in Mastodon network.
* [Forget](https://forget.codl.fr/) - Delete toots after a user defined period of time (Python [source code](https://github.com/codl/forget/)).
## User styles ## User styles
@ -90,11 +91,9 @@ Please note: most of them are non-official. Also, we do not *recommend* any, the
* [@HackerNewsBot@mastodon.social](https://mastodon.social/@HackerNewsBot) - Hacker News. * [@HackerNewsBot@mastodon.social](https://mastodon.social/@HackerNewsBot) - Hacker News.
* [@nasa@apoil.org](https://apoil.org/@nasa) - NASA. * [@nasa@apoil.org](https://apoil.org/@nasa) - NASA.
* [@newsstream@quitter.im](https://quitter.im/newsstream) - NewsStream. * [@newsstream@quitter.im](https://quitter.im/newsstream) - NewsStream.
* [@openrightsgroupbot@mastodon.blue](https://mastodon.blue/@openrightsgroupbot) - Open Rights Group.
* [@btc@framapiaf.org](https://framapiaf.org/@btc) - News about the Bitcoin Cryptocurrency (marketcap, community, rise/drop alerts). * [@btc@framapiaf.org](https://framapiaf.org/@btc) - News about the Bitcoin Cryptocurrency (marketcap, community, rise/drop alerts).
* [@ethereum@framapiaf.org](https://framapiaf.org/@ethereum) - News about the Ethereum Cryptocurrency (marketcap, community, rise/drop alerts). * [@ethereum@framapiaf.org](https://framapiaf.org/@ethereum) - News about the Ethereum Cryptocurrency (marketcap, community, rise/drop alerts).
* [@monero@framapiaf.org](https://framapiaf.org/@monero) - News about the Monero Cryptocurrency (marketcap, community, rise/drop alerts). * [@monero@framapiaf.org](https://framapiaf.org/@monero) - News about the Monero Cryptocurrency (marketcap, community, rise/drop alerts).
* [@tedtalks@3.nu](https://3.nu/@tedtalks) - TED Talks.
### Français ### Français
@ -102,7 +101,6 @@ Please note: most of them are non-official. Also, we do not *recommend* any, the
* [@courrierinter@mastodon.xyz](https://mastodon.xyz/@courrierinter) - Courrier international. * [@courrierinter@mastodon.xyz](https://mastodon.xyz/@courrierinter) - Courrier international.
* [@artefr@mamot.fr](https://mamot.fr/@artefr) - Arte. * [@artefr@mamot.fr](https://mamot.fr/@artefr) - Arte.
* [@datagueule@framapiaf.org](https://framapiaf.org/@datagueule) - DATA Gueule. * [@datagueule@framapiaf.org](https://framapiaf.org/@datagueule) - DATA Gueule.
* [@letemps@mastodon.blue](https://mastodon.blue/@letemps) - Le Temps.
* [@lemondebot@mastodon.xyz](https://mastodon.xyz/@lemondebot) - Le Monde. * [@lemondebot@mastodon.xyz](https://mastodon.xyz/@lemondebot) - Le Monde.
* [@libe@mamot.fr](https://mamot.fr/@libe) - Libération. * [@libe@mamot.fr](https://mamot.fr/@libe) - Libération.
* [@lecanardenchaine@mamot.fr](https://mamot.fr/@lecanardenchaine) - Le Canard Enchaîné. * [@lecanardenchaine@mamot.fr](https://mamot.fr/@lecanardenchaine) - Le Canard Enchaîné.
@ -115,9 +113,7 @@ Please note: most of them are non-official. Also, we do not *recommend* any, the
* [@NextInpact@mamot.fr](https://mamot.fr/@NextInpact) - NextInpact. * [@NextInpact@mamot.fr](https://mamot.fr/@NextInpact) - NextInpact.
* [@numerama@social.numerama.com](https://social.numerama.com/@numerama) - Numerama. * [@numerama@social.numerama.com](https://social.numerama.com/@numerama) - Numerama.
* [@reflets@mastodon.social](https://mastodon.social/@reflets) - Reflets.info. * [@reflets@mastodon.social](https://mastodon.social/@reflets) - Reflets.info.
* [@rtsinfobot@mastodon.blue](https://mastodon.blue/@rtsinfobot) - RTS Info.
* [@TV5Monde@mamot.fr](https://mamot.fr/@TV5Monde) - TV5 Monde. * [@TV5Monde@mamot.fr](https://mamot.fr/@TV5Monde) - TV5 Monde.
* [@sciencesetavenirbot@3.nu](https://3.nu/@sciencesetavenir) - Sciences et Avenir.
## Associations ## Associations