Merge branch 'master' into patch-1

This commit is contained in:
tleb 2019-04-21 19:10:47 +03:00 committed by GitHub
commit 5f738c5ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions

View File

@ -50,6 +50,25 @@
* [Halcyon](https://notabug.org/halcyon-suite/halcyon) - Alternative web client for Mastodon and Pleroma with a Twitter-like interface.
* [Whalebird](https://whalebird.org/en/desktop/contents) - Mastodon client for Mac OS.
* [Planiverse](https://github.com/FuzzJunket/planiverse) - Minimalist, no-JS Web client for Mastodon.
* [Toot!](https://itunes.apple.com/app/toot/id1229021451?ls=1&mt=8) - Mastodon client for iOS.
## Federated servers
* [Mastodon](https://joinmastodon.org/) - Most known microblogging platform
* [Pleroma](https://pleroma.social/) - Lightweight microblogging platform
* [GnuSocial](https://gnu.io/social/) - Oldest microblogging platform
* [Misskey](https://joinmisskey.github.io/) - Sophisticated microblogging platform
* [Microblog.pub](https://microblog.pub/) - Single-user lightweight microblogging platform
* [Osada](https://zotlabs.com/osada/) - Alternate blog / social networks platform with file, contacts and events sharing
* [Hubzilla](https://project.hubzilla.org/page/hubzilla/hubzilla-project) - Blog / social networks platform with file, contacts and events sharing
* [Friendica](https://friendi.ca/) - Social network platform
* [Peertube](https://joinpeertube.org/) - Video sharing platform
* [FunkWhale](https://funkwhale.audio/) - Audio sharing platform
* [Plume](https://plume-org.github.io/Plume/) - Blogging platform
* [WriteFreely](https://writefreely.org/) - Blogging platform
* [Prismo](https://gitlab.com/mbajur/prismo) - Link aggregation platform
* [PixelFed](https://pixelfed.org/) - Photograph sharing platform
* [NextCloud Social](https://apps.nextcloud.com/apps/social) - Microblogging inside the cloud platform
## Tools
@ -63,6 +82,7 @@
* [Forget](https://forget.codl.fr/about/) - Delete toots after a user defined period of time (Python [source code](https://github.com/codl/forget/)).
* [Mastodon Toot Bookmarklet](https://rmlewisuk.github.io/mastodon-toot-bookmarklet/) - Bookmarklet to toot the current page ([source code](https://github.com/rmlewisuk/mastodon-toot-bookmarklet/))
* [Mastodon Simplified Federation!](https://addons.mozilla.org/firefox/addon/mastodon-simplified-federation/?src=external-github-awesomelist) - Redirect clicks on remote follow/interaction buttons to your own instance. ([source code](https://github.com/rugk/mastodon-simplified-federation))
* [Mastodon Explorer](https://mastodon-explorer.netlify.com/) - Trending hashtags and popular toots, regenerated every hour.
## User styles