Merge with upstream
This commit is contained in:
aRubes
commit
2bd7fecfe8
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Our [servers list](https://fediverse.party/en/portal/servers) promotes new small Fediverse instances, and we have the following criteria for inclusion:
|
||||
|
||||
1. At the moment we accept servers running following software: Mastodon (Glitch-Soc, Hometown), Pleroma (Akkoma), Friendica, Misskey (Calckey), Hubzilla (the list may be expanded in the future).
|
||||
1. At the moment we accept servers running following software: Mastodon (Glitch-Soc, Hometown), Pleroma (Akkoma), Friendica, Misskey (Firefish), Hubzilla (the list may be expanded in the future).
|
||||
|
||||
2. Only servers with open or pre-moderated registration are accepted. Servers with pre-moderated signup (a question like "Why do you want to join?" on signup) must be added to the category "Various (registration by application)".
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@
|
|||
},
|
||||
{
|
||||
"name": "TypeScript",
|
||||
"networks": "Calckey, Misskey, PeerTube"
|
||||
"networks": "Firefish, Misskey, PeerTube"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
{"num": "1", "url": "https://the-federation.info/diaspora"},
|
||||
{"num": "2", "url": "https://diaspora.fediverse.observer/list"}
|
||||
],
|
||||
"serverWizard": "https://fediverse.observer/list?wizard",
|
||||
"mobile": "https://f-droid.org/en/packages/com.github.dfa.diaspora_android",
|
||||
"proxy": "https://wiki.diasporafoundation.org/Installation/Camo",
|
||||
"tutorials":
|
||||
|
|
|
|||
|
|
@ -22,10 +22,9 @@
|
|||
[
|
||||
{"num": "1", "url": "https://the-federation.info/friendica"},
|
||||
{"num": "2", "url": "https://dir.friendica.social/servers"},
|
||||
{"num": "3", "url": "https://fedidb.org/network/?s=friendica"},
|
||||
{"num": "3", "url": "https://fedidb.org/software/friendica"},
|
||||
{"num": "4", "url": "https://friendica.fediverse.observer/list"}
|
||||
],
|
||||
"serverWizard": "https://fediverse.observer/list?wizard",
|
||||
"mobile": "https://github.com/friendica/friendica/wiki/Clients",
|
||||
"tutorials":
|
||||
[
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
[
|
||||
{"num": "1", "url": "https://network.funkwhale.audio/dashboards/d/overview/network-overview"},
|
||||
{"num": "2", "url": "https://the-federation.info/funkwhale"},
|
||||
{"num": "3", "url": "https://fedidb.org/network/?s=funkwhale"},
|
||||
{"num": "3", "url": "https://fedidb.org/software/funkwhale"},
|
||||
{"num": "4", "url": "https://funkwhale.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://funkwhale.audio/en_US/apps",
|
||||
"forUsers":
|
||||
[
|
||||
{"id": "0", "url": "https://docs.funkwhale.audio/stable/users/index.html"}
|
||||
{"id": "0", "url": "https://docs.funkwhale.audio/user/index.html"}
|
||||
],
|
||||
"devTutorial": "https://docs.funkwhale.audio/stable/installation/index.html",
|
||||
"services":
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://the-federation.info/gnusocial"},
|
||||
{"num": "2", "url": "https://fedidb.org/network/?s=gnusocial"},
|
||||
{"num": "2", "url": "https://fedidb.org/software/gnusocial"},
|
||||
{"num": "3", "url": "https://gnusocial.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://the-federation.info/hubzilla"},
|
||||
{"num": "2", "url": "https://fedidb.org/network/?s=hubzilla"},
|
||||
{"num": "2", "url": "https://fedidb.org/software/hubzilla"},
|
||||
{"num": "3", "url": "https://hubzilla.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://f-droid.org/en/packages/com.dfa.hubzilla_android",
|
||||
|
|
|
|||
|
|
@ -18,13 +18,12 @@
|
|||
"wiki": "",
|
||||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://the-federation.info/mastodon"},
|
||||
{"num": "2", "url": "/en/portal/servers"},
|
||||
{"num": "1", "url": "/en/portal/servers"},
|
||||
{"num": "2", "url": "https://the-federation.info/mastodon"},
|
||||
{"num": "3", "url": "https://instances.social"},
|
||||
{"num": "4", "url": "https://mastodon.fediverse.observer/list"}
|
||||
|
||||
],
|
||||
"serverWizard": "https://fediverse.observer/list?wizard",
|
||||
"mobile": "https://joinmastodon.org/apps",
|
||||
"forUsers":
|
||||
[
|
||||
|
|
@ -40,10 +39,6 @@
|
|||
{"id": "1", "url": "https://gist.github.com/joyeusenoelle/74f6e6c0f349651349a0df9ae4582969"}
|
||||
],
|
||||
"devTutorial": "https://github.com/mastodon/documentation",
|
||||
"metrics":
|
||||
[
|
||||
{"id": "0", "url": "http://sp3r4z.fr/mastodon"}
|
||||
],
|
||||
"forTechies":
|
||||
[
|
||||
{"id": "0", "url": "https://github.com/tleb/awesome-mastodon"},
|
||||
|
|
@ -64,12 +59,8 @@
|
|||
"utilities":
|
||||
[
|
||||
{"id": "0", "url": "https://www.mastofeed.com"},
|
||||
{"id": "1", "url": "https://crossposter.masto.donte.com.br"},
|
||||
{"id": "2", "url": "http://www.unmung.com/mastoview"},
|
||||
{"id": "3", "url": "https://fed.brid.gy"},
|
||||
{"id": "4", "url": "https://gitlab.com/chaica/feed2toot"},
|
||||
{"id": "5", "url": "https://moa.party"},
|
||||
{"id": "6", "url": "https://pleromabot.robertoszek.xyz"}
|
||||
{"id": "1", "url": "https://gitlab.com/chaica/feed2toot"},
|
||||
{"id": "2", "url": "https://pleromabot.robertoszek.xyz/pleroma-bot"}
|
||||
],
|
||||
"mascot": [{"item": "mastodon", "imgNum": "1"}],
|
||||
"dwellers": "mastonauts",
|
||||
|
|
|
|||
|
|
@ -335,11 +335,15 @@
|
|||
"description": "An ActivityPub server with minimal dependencies, optimized for single-user application.",
|
||||
"codeLanguage": "Crystal",
|
||||
"techStack": "",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"license": "GNU Affero General Public License",
|
||||
=======
|
||||
"license": "AGPL-3.0",
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
"license": "AGPL-3.0",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"FediAccount": "@toddsundsted@mastodon.social",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
|
|
@ -348,6 +352,7 @@
|
|||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"title": "OLKi",
|
||||
"source": "https://framagit.org/synalp/olki/olki",
|
||||
|
|
@ -360,14 +365,32 @@
|
|||
"techStack": "Django, Vue, Nuxt, Spectre.css, Zutre",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@cerisara@mastodon.etalab.gouv.fr",
|
||||
=======
|
||||
"title": "pubgate",
|
||||
"source": "https://github.com/autogestion/pubgate",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "https://the-federation.info/pubgate",
|
||||
"description": "Lightweight ActivityPub CMS. Implements both client-to-server (C2S) and server-to-server(S2S) APIs. Compatible with Mastodon, Pixelfed, Pleroma and microblog.pub.",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "",
|
||||
"license": "BSD-3-clause",
|
||||
"FediAccount": "",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
<<<<<<< HEAD
|
||||
"categories": ["OpenData", "SN-mi"]
|
||||
},
|
||||
=======
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
{
|
||||
"title": "castling.club",
|
||||
"source": "https://github.com/stephank/castling.club",
|
||||
|
|
@ -549,6 +572,27 @@
|
|||
"categories": ["Ev-Meet"]
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"title": "Rustodon",
|
||||
"source": "https://github.com/rustodon/rustodon",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "Mastodon-compatible social microblogging server.",
|
||||
"codeLanguage": "Rust",
|
||||
"techStack": "Diesel, SASS",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"title": "Aardwolf",
|
||||
"source": "https://github.com/Aardwolf-Social/aardwolf",
|
||||
"protocols": "ActivityPub",
|
||||
|
|
@ -1216,6 +1260,7 @@
|
|||
},
|
||||
{
|
||||
"title": "Firefish",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"source": "https://gitlab.prometheus.systems/firefish/firefish",
|
||||
"protocols": "ActivityPub",
|
||||
|
|
@ -1228,6 +1273,14 @@
|
|||
"logo": "/img/misc/firefish.svg",
|
||||
"servers": "https://firefish.fediverse.observer/list",
|
||||
"description": "A fun, new, open way to experience social media. Foremerly known as Calckey, originally a Misskey fork",
|
||||
=======
|
||||
"source": "https://git.joinfirefish.org/firefish/firefish",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://joinfirefish.org",
|
||||
"logo": "/img/misc/firefish.svg",
|
||||
"servers": "https://firefish.fediverse.observer/list",
|
||||
"description": "A fun, new, open way to experience social media. A fork of Misskey, formerly known as Calckey.",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"codeLanguage": "TypeScript",
|
||||
"techStack": "Node.js, Vue",
|
||||
"license": "AGPL-3.0",
|
||||
|
|
@ -1278,18 +1331,26 @@
|
|||
"title": "Takahe",
|
||||
"source": "https://github.com/andrewgodwin/takahe",
|
||||
"protocols": "ActivityPub",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"site": "https://jointakahe.org/takahesocial/",
|
||||
=======
|
||||
"site": "https://jointakahe.org",
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
"site": "https://jointakahe.org",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"logo": "/img/misc/takahe.svg",
|
||||
"servers": "",
|
||||
"description": "A very experimental Fediverse server for microblogging.",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "Django",
|
||||
"license": "BSD-3-clause",
|
||||
<<<<<<< HEAD
|
||||
"FediAccount": "@takahe@jointakahe.org",
|
||||
=======
|
||||
"FediAccount": "@takahe@jointakahe.takahe.social",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -20,16 +20,22 @@
|
|||
{"num": "1", "url": "https://misskey-hub.net/en/instances.html"},
|
||||
{"num": "2", "url": "https://join.misskey.page/en/wiki/instances"},
|
||||
{"num": "3", "url": "https://the-federation.info/misskey"},
|
||||
{"num": "4", "url": "https://fedidb.org/network/?s=misskey"},
|
||||
{"num": "4", "url": "https://fedidb.org/software/misskey"},
|
||||
{"num": "5", "url": "https://misskey.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://misskey-hub.net/en/docs/faq.html",
|
||||
"devTutorial": "https://misskey-hub.net/en/docs/install.html",
|
||||
"forks":
|
||||
[
|
||||
<<<<<<< HEAD
|
||||
{"id": "0", "url": "https://firefish.social/", "descr": "formerly known as Calckey, Firefish was originally a Misskey fork"},
|
||||
{"id": "1", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "Foundkey - fork that removes bloat from Misskey"},
|
||||
{"id": "2", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"}
|
||||
=======
|
||||
{"id": "0", "url": "https://joinfirefish.org/", "descr": "Firefish - hard fork with a community oriented direction"},
|
||||
{"id": "1", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"},
|
||||
{"id": "2", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "FoundKey - hard fork that removes bloat from Misskey"}
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
],
|
||||
"mascot": [{"item": "藍 (Ai)", "imgNum": "1"}],
|
||||
"dwellers": "Miskist",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
{
|
||||
"data":
|
||||
{
|
||||
"title": "misskey",
|
||||
"category": "social network",
|
||||
"type": "microblogging",
|
||||
"logoClr": "9fd608",
|
||||
"created": "2014",
|
||||
"official": "https://misskey-hub.net/en",
|
||||
"license": "AGPL-3.0",
|
||||
"repo": "https://github.com/misskey-dev/misskey",
|
||||
"language": "TypeScript",
|
||||
"protocols":
|
||||
[
|
||||
{"title": "ActivityPub", "url": "https://activitypub.rocks"}
|
||||
],
|
||||
"wiki": "https://misskey-hub.net/en/docs/misskey.html",
|
||||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://misskey-hub.net/en/instances.html"},
|
||||
{"num": "2", "url": "https://join.misskey.page/en/wiki/instances"},
|
||||
{"num": "3", "url": "https://the-federation.info/misskey"},
|
||||
{"num": "4", "url": "https://fedidb.org/software/misskey"},
|
||||
{"num": "5", "url": "https://misskey.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://misskey-hub.net/en/docs/faq.html",
|
||||
"devTutorial": "https://misskey-hub.net/en/docs/install.html",
|
||||
"forks":
|
||||
[
|
||||
<<<<<<< HEAD
|
||||
{"id": "0", "url": "https://firefish.social/", "descr": "formerly known as Calckey, Firefish was originally a Misskey fork"},
|
||||
{"id": "1", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "Foundkey - fork that removes bloat from Misskey"},
|
||||
{"id": "2", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"}
|
||||
=======
|
||||
{"id": "0", "url": "https://joinfirefish.org/", "descr": "Firefish - hard fork with a community oriented direction"},
|
||||
{"id": "1", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"},
|
||||
{"id": "2", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "FoundKey - hard fork that removes bloat from Misskey"}
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
],
|
||||
"mascot": [{"item": "藍 (Ai)", "imgNum": "1"}],
|
||||
"dwellers": "Miskist",
|
||||
"communities": "",
|
||||
"descr": "Apart from the mainstream microblogging experience, this network provides many additional features like a calendar, emoji reactions, rich chatting, antennas, animated text posts, and more. The web client can be customized by choosing from various available widgets. Original interface language is Japanese, but translations for many other languages such as English, German, Korean and more are available.",
|
||||
"connections": ["Friendica", "Hubzilla", "microblog.pub", "Mastodon", "PeerTube", "Pixelfed", "Pleroma", "Plume", "WriteFreely"],
|
||||
"screenshots":
|
||||
[
|
||||
{"descr": "Misskey interface", "img": "misskey-1.jpg"},
|
||||
{"descr": "Dark theme", "img": "misskey-2.jpg"}
|
||||
],
|
||||
"features":
|
||||
[
|
||||
"polls",
|
||||
"emoji reactions",
|
||||
"lists",
|
||||
"calendar",
|
||||
"trends",
|
||||
"recommended users",
|
||||
"tips for newcomers",
|
||||
"server information",
|
||||
"animated markdown",
|
||||
"rich chatting"
|
||||
],
|
||||
"donate": "https://www.patreon.com/syuilo",
|
||||
"tracker": "https://github.com/syuilo/misskey/issues",
|
||||
"bounty": "",
|
||||
"translating": "https://crowdin.com/project/misskey",
|
||||
"reading": "",
|
||||
"notable": ""
|
||||
}
|
||||
}
|
||||
|
|
@ -96,10 +96,10 @@
|
|||
"activeUsers": "13\u00a0789",
|
||||
"podsNum": "498"
|
||||
},
|
||||
"calckey": {
|
||||
"population": "8\u00a0015",
|
||||
"activeUsers": "6\u00a0217",
|
||||
"podsNum": "339"
|
||||
"firefish": {
|
||||
"population": "20\u00a0699",
|
||||
"activeUsers": "12\u00a0227",
|
||||
"podsNum": "588"
|
||||
},
|
||||
"hometown": {
|
||||
"population": "14\u00a0458",
|
||||
|
|
@ -112,4 +112,4 @@
|
|||
"podsNum": "19\u00a0440"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
[
|
||||
{"num": "1", "url": "https://joinpeertube.org/instances"},
|
||||
{"num": "2", "url": "https://the-federation.info/peertube"},
|
||||
{"num": "3", "url": "https://fedidb.org/network/?s=peertube"},
|
||||
{"num": "3", "url": "https://fedidb.org/software/peertube"},
|
||||
{"num": "4", "url": "https://peertube.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://docs.joinpeertube.org/#/use-third-party-application",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://the-federation.info/pixelfed"},
|
||||
{"num": "2", "url": "https://fedidb.org/network/?s=pixelfed"},
|
||||
{"num": "2", "url": "https://fedidb.org/software/pixelfed"},
|
||||
{"num": "3", "url": "https://pixelfed.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://github.com/glitchpizza/morii",
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://the-federation.info/pleroma"},
|
||||
{"num": "2", "url": "https://fedidb.org/network/?s=pleroma"},
|
||||
{"num": "2", "url": "https://fedidb.org/software/pleroma"},
|
||||
{"num": "3", "url": "https://pleroma.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://docs-develop.pleroma.social/backend/clients",
|
||||
|
|
|
|||
|
|
@ -1153,24 +1153,6 @@
|
|||
"OStatusClass": false,
|
||||
"categories": ["Bridges"]
|
||||
},
|
||||
{
|
||||
"title": "Mastodon Twitter poster",
|
||||
"source": "https://crossposter.masto.donte.com.br",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "Crossposter to post statuses between Mastodon and Twitter.",
|
||||
"codeLanguage": "Ruby",
|
||||
"techStack": "",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@crossposter@masto.donte.com.br",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Bridges"]
|
||||
},
|
||||
{
|
||||
"title": "Twitter Hamachpil",
|
||||
"source": "https://gitlab.com/hamachpil/twitter_hamachpil",
|
||||
|
|
@ -1891,24 +1873,6 @@
|
|||
"OStatusClass": false,
|
||||
"categories": ["Utils"]
|
||||
},
|
||||
{
|
||||
"title": "Twitodon",
|
||||
"source": "https://github.com/diddledani/twitodon",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://twitodon.com",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "Twitter to Mastodon account mapping service to aid migration away from Twitter without losing all your followed friends.",
|
||||
"codeLanguage": "Javascript",
|
||||
"techStack": "",
|
||||
"license": "-",
|
||||
"FediAccount": "",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Utils"]
|
||||
},
|
||||
{
|
||||
"title": "ActivityPub Models",
|
||||
"source": "https://github.com/activitypub-js/activitypub-models",
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Newcomers are usually advised to create an "introductions" post, telling a few w
|
|||
**Note**: If you speak Catalan or Spanish, join the [online meeting](https://bbb.exo.cat/b/rit-vd9-fhv) of fedizens [dedicated](https://agora.fedi.cat/t/18-de-maig-fedianiversari/313) to this special day (from 19h30 to 21h30 UTC+2).
|
||||
|
||||
|
||||
<small class="u-block u-center">Credits: promo image - by <a href="https://barcelona.social/users/titi">@titi</a>, CC BY-SA, <a href="https://arxius.laloka.org/projectes/Fedicat/cartells/2021-trobada-fediverse13.svg">source</a></small>
|
||||
<small class="u-block u-center">Credits: promo image - by <a href="https://bcn.fedi.cat/@titi">@titi</a>, CC BY-SA</small>
|
||||
|
||||
### Planting the seeds
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ At least <span class="u-emphasize">10 new networks</span> expressed a wish to be
|
|||
|
||||
✔ `May:` Fediverse has a 🐣 Birthday, technically - [11 years](https://social.diekershoff.de/display/f3ad7b1c-145c-e10f-1e74-b7b177306491) and counting. Happy Birthday, Fedi!
|
||||
|
||||
✔ `July:` Hubzilla community announces a [call for participation](https://www.w3.org/community/zot) to standardize the Zot protocol used in [Hubzilla](/en/hubzilla) and [Zap](https://codeberg.org/zot/zap) software
|
||||
✔ `July:` Hubzilla community announces a [call for participation](https://www.w3.org/community/zot) to standardize the Zot protocol used in [Hubzilla](/en/hubzilla) software
|
||||
|
||||
✔ `July:` [Pixelfed](/en/pixelfed) starts federating with other Fedi networks. A long awaited update
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ Most used providers 2019:
|
|||
|
||||
|
||||
|
||||
You can see Mastodon statistics on [servers](http://sp3r4z.fr/mastodon/general) and [providers](http://sp3r4z.fr/mastodon/providers). The situation hasn't changed much since 2018 Leah's [research](https://chaos.social/@leah/99837391793032137) on server distribution. Will something change in 2020?
|
||||
The situation hasn't changed much since 2018 Leah's [research](https://chaos.social/@leah/99837391793032137) on server distribution. Will something change in 2020?
|
||||
|
||||
### Fediverse.party news:
|
||||
|
||||
|
|
|
|||
|
|
@ -47,9 +47,7 @@ Seven networks growing most rapidly in *online* server numbers in 2020 were:
|
|||
|
||||
### Fediverse in projects
|
||||
|
||||
At least <span class="u-emphasize">17 new projects</span> joined Fediverse in 2020!
|
||||
|
||||
🌟 [Hash2Pub](https://git.orlives.de/schmittlauch/Hash2Pub) – a fully-decentralised DHT-based relay for global hashtag federation
|
||||
At least <span class="u-emphasize">16 new projects</span> joined Fediverse in 2020!
|
||||
|
||||
🌟 [Bonfire](https://gitlab.com/bonfire-ecosystem/activitypub) – a plug & play federated social network based on CommonsPub
|
||||
|
||||
|
|
@ -85,9 +83,6 @@ At least <span class="u-emphasize">17 new projects</span> joined Fediverse in 20
|
|||
|
||||
→ For a full list of Fediverse projects in development see [Miscellaneous](https://fediverse.party/en/miscellaneous) page.
|
||||
|
||||
#### Project forks:
|
||||
• [Mistpark 2020](https://codeberg.org/zot/misty) – also known as "misty", a webserver app that supports ActivityPub and Zot protocols, fork of Zap
|
||||
|
||||
#### Related new projects:
|
||||
• [SepiaSearch](https://sepiasearch.org) – search engine for PeerTube
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ At least <span class="u-emphasize">13 new projects</span> joined Fediverse in 20
|
|||
|
||||
### Fediverse ecosystem
|
||||
|
||||
In July [Inexcode](https://social.inex.rocks/@inexcode) relaunched [fediverse.space](https://fediverse.space) - a beautiful project that has previously been developed by Tao Bojlén and that got a second life thanks to its codebase being open source! In August Paula [launched](https://climatejustice.social/@PaulaToThePeople/106681444006722123) a new forum for any discussions related to Fediverse - [fediverse.town](https://fediverse.town). In November [Minoru](https://functional.cafe/@minoru) open sourced Fediverse [nodes list](https://nodes.fediverse.party) to help public statistics hubs and to empower new ecosystem developments! And by the end of the year, [Fediverse Wiki](https://joinfediverse.wiki) project was launched.
|
||||
In July [Inexcode](https://social.inex.rocks/@inexcode) relaunched [fediverse.space](https://fediverse.space) - a beautiful project that has previously been developed by Tao Bojlén and that got a second life thanks to its codebase being open source! In November [Minoru](https://functional.cafe/@minoru) open sourced Fediverse [nodes list](https://nodes.fediverse.party) to help public statistics hubs and to empower new ecosystem developments! And by the end of the year, [Fediverse Wiki](https://joinfediverse.wiki) project was launched.
|
||||
|
||||
|
||||
<small class="u-block u-center"><span class="u-emphasize">Credits:</span> background image by Alex Antropov, Pixabay license</small>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ layout: "post"
|
|||
title: "Themed servers"
|
||||
---
|
||||
|
||||
**Unsure where to register to join Fediverse?** Choose a website from this curated list. It includes [Mastodon](/en/mastodon), Glitch-soc and Hometown (Mastodon forks), [Pleroma](/en/pleroma) and Akkoma (Pleroma fork), [Friendica](/en/friendica), [Misskey](/en/misskey) and Calckey (Misskey fork), and [Hubzilla](/en/hubzilla) servers. Websites are not restricted to their theme. They help people with common interests find their community.
|
||||
**Unsure where to register to join Fediverse?** Choose a website from this curated list. It includes [Mastodon](/en/mastodon), Glitch-soc and Hometown (Mastodon forks), [Pleroma](/en/pleroma) and Akkoma (Pleroma fork), [Friendica](/en/friendica), [Misskey](/en/misskey) and Firefish (Misskey fork), and [Hubzilla](/en/hubzilla) servers. Websites are not restricted to their theme. They help people with common interests find their community.
|
||||
|
||||
Information about adding a server can be found [here](https://codeberg.org/fediverse/fediparty/src/branch/main/ADDING-SERVER.md).
|
||||
|
||||
|
|
@ -48,9 +48,9 @@ Information about adding a server can be found [here](https://codeberg.org/fediv
|
|||
* [bikesare.cool](https://bikesare.cool) - space for competitive and casual cyclists *(Mastodon)*
|
||||
* [social.vtopia.live](https://social.vtopia.live) - for Vtubers, their fans, and the creators that make them possible *(Misskey)*
|
||||
* [gametoots.de](https://gametoots.de) - for gamers and streamers *(Mastodon)*
|
||||
* [hub.adrelien.com](https://hub.adrelien.com) - for all sports, e-sports, and gaming enthusiasts *(Calckey)* *(Google reCAPTCHA)*
|
||||
* [hub.adrelien.com](https://hub.adrelien.com) - for all sports, e-sports, and gaming enthusiasts *(Firefish)* *(Google reCAPTCHA)*
|
||||
* [mastodon.triggerphra.se](https://mastodon.triggerphra.se) - for the hypnosis community; 18+, queer, and getting very sleepy *(Mastodon)*
|
||||
* [redd.live](https://redd.live) - community for ReddCoin and cryptocurrency users *(Mastodon)* *(Cloudflared)*
|
||||
* [moth.orchids.social](https://moth.orchids.social) - for orchid lovers *(Mastodon)*
|
||||
|
||||
### 🚄 [Travel, Transport and Infrastructure](#travel)
|
||||
* [rail.chat](https://rail.chat) - discussions about long-distance, passenger and freight rail networks for economic, environmental and equity benefits *(Mastodon)*
|
||||
|
|
@ -74,13 +74,12 @@ Information about adding a server can be found [here](https://codeberg.org/fediv
|
|||
* [occitania.social](https://occitania.social) - community of Occitan culture and language *(Mastodon)*
|
||||
* [samenet.social](https://samenet.social) - Sámi language *(Mastodon)*
|
||||
* [mastodo.fi](https://mastodo.fi) - Finnish language *(Mastodon)*
|
||||
* [twitteregypt.online](https://twitteregypt.online) - Arabic language *(Mastodon)*
|
||||
* [vkl.world](https://vkl.world) - Belarusian language *(Mastodon)*
|
||||
* [9kb.me](https://9kb.me) - Chinese language *(Mastodon)*
|
||||
* [fairy.id](https://fairy.id) - Chinese language *(Mastodon)*
|
||||
* [e.fo](https://e.fo) - Faroese language *(Mastodon)*
|
||||
* [kanoa.de](https://kanoa.de) - German language *(Mastodon)*
|
||||
* [electricrequiem.com](https://electricrequiem.com) - Greek language *(Calckey)* *(Google reCAPTCHA)*
|
||||
* [electricrequiem.com](https://electricrequiem.com) - Greek language *(Firefish)* *(Google reCAPTCHA)*
|
||||
|
||||
### 🛡 [Safer spaces](#safer-spaces)
|
||||
|
||||
|
|
@ -107,20 +106,16 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [mastodon-belgium.be](https://mastodon-belgium.be) - Belgium *(Mastodon)*
|
||||
|
||||
#### Canada
|
||||
|
||||
* [halifaxsocial.ca](https://halifaxsocial.ca) - Halifax *(Mastodon)*
|
||||
* [vancity.social](https://vancity.social) - Vancouver *(Calckey)*
|
||||
* [vancity.social](https://vancity.social) - Vancouver *(Firefish)*
|
||||
|
||||
#### Czech Republic
|
||||
* [witter.cz](https://witter.cz) - Czech Republic *(Mastodon)*
|
||||
|
||||
#### Denmark
|
||||
* [norrebro.space](https://norrebro.space) - Denmark *(Mastodon)*
|
||||
* [fynbo.social](https://fynbo.social) - Denmark *(Mastodon)*
|
||||
|
||||
#### Egypt
|
||||
* [twitteregypt.online](https://twitteregypt.online) - Egypt *(Mastodon)*
|
||||
* [masr.social](https://masr.social) - Egypt *(Mastodon)*
|
||||
|
||||
#### Finland
|
||||
* [mastodo.fi](https://mastodo.fi) - Finland *(Mastodon)*
|
||||
|
|
@ -143,7 +138,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [cas.social](https://cas.social) - Castrop-Rauxel *(Mastodon)*
|
||||
* [im.allmendenetz.de](https://im.allmendenetz.de) - Cologne, Germany *(Hubzilla)*
|
||||
* [toot.berlin](https://toot.berlin) - Berlin *(Mastodon)*
|
||||
* [bz.pawdev.me](https://bz.pawdev.me) - Bautzen *(Calckey)* *(Cloudflared)* *(hCaptcha)*
|
||||
* [kowelenz.social](https://kowelenz.social) - Koblenz *(Akkoma)*
|
||||
|
||||
#### Indonesia
|
||||
|
|
@ -151,7 +145,7 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [mastodonindonesia.com](https://mastodonindonesia.com) - Indonesia *(Mastodon)*
|
||||
|
||||
#### Italy
|
||||
* [www.foxyhole.io](https://www.foxyhole.io) - Italy *(Calckey)* *(hCaptcha)*
|
||||
* [foxyhole.io](https://foxyhole.io) - Italy *(Firefish)* *(hCaptcha)*
|
||||
|
||||
#### Nigeria
|
||||
* [mastodon.holeyfox.co](https://mastodon.holeyfox.co) - Nigeria *(Mastodon)*
|
||||
|
|
@ -171,7 +165,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
|
||||
#### Switzerland
|
||||
* [swiss.social](https://swiss.social) - Switzerland *(Mastodon)*
|
||||
* [basel.social](https://basel.social) - Basel and Basel region *(Mastodon)*
|
||||
* [mastodon.free-solutions.org](https://mastodon.free-solutions.org) - Switzerland *(Mastodon)*
|
||||
* [swiss-talk.net](https://swiss-talk.net) - Switzerland *(Mastodon)*
|
||||
|
||||
|
|
@ -181,7 +174,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
|
||||
#### UK
|
||||
* [bath.social](https://bath.social) - Bath *(Mastodon)*
|
||||
* [gib.social](https://gib.social) - Gibraltar *(Mastodon)*
|
||||
|
||||
#### USA
|
||||
* [socialclub.nyc](https://socialclub.nyc) - New York *(Mastodon)*
|
||||
|
|
@ -195,19 +187,15 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [devschile.social](https://devschile.social) - for Spanish-language techies of Chile *(Mastodon)*
|
||||
* [k8s.social](https://k8s.social) - for kubernetes, container and cloud native enthusiasts *(Mastodon)*
|
||||
* [gnulinux.social](https://gnulinux.social) - community dedicated to Free Software enthusiasts and supporters
|
||||
* [h4x0r.army](https://h4x0r.army) - community for hackers, pentesters, programmers, and more *(Mastodon)* *(Cloudflared)*
|
||||
* [dataanalytics.social](https://dataanalytics.social) - for data and analytics topics *(Mastodon)*
|
||||
* [technodon.org](https://technodon.org) - general technology discussion *(Mastodon)* *(Cloudflared)*
|
||||
* [toot.works](https://toot.works) - for folks who make things with bits, wires, wood, and more *(Mastodon)*
|
||||
|
||||
### 💻 [Programming](#instances-for-programmers)
|
||||
* [pythondevs.social](https://pythondevs.social) - for Python developers of all experience levels *(Pleroma)*
|
||||
* [pythonist.as](https://pythonist.as) - for Pythonistas *(Mastodon)*
|
||||
* [dotnet.social](https://dotnet.social) - .NET *(Mastodon)*
|
||||
* [jvm.social](https://jvm.social) - JVM technologies related server *(Mastodon)*
|
||||
|
||||
### 🎬 [Book / Game / Show theme](#entertainment)
|
||||
* [osrs.club](https://osrs.club) - themed around Old School Runescape *(Pleroma)*
|
||||
* [greenhill.zone](https://greenhill.zone) - multilingual instance for fans of Sonic the Hedgehog *(Mastodon)*
|
||||
|
||||
### 🐰 [Environmentalism](#environmentalism)
|
||||
|
|
@ -221,7 +209,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
|
||||
### ⚕ [Healthcare](#health)
|
||||
* [fedisabled.social](https://fedisabled.social) - for all disabled people *(Mastodon)*
|
||||
* [diabetes.masto.host](https://diabetes.masto.host) - safe harbor for people affected by diabetes *(Mastodon)*
|
||||
* [medibubble.org](https://medibubble.org) - for medical professionals and everyone else, in German *(Mastodon)*
|
||||
|
||||
### 👽 [Fandoms](#fandoms)
|
||||
|
|
@ -230,7 +217,7 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
|
||||
### 🐾 [Subcultures](#subcultures)
|
||||
* [birds.garden](https://birds.garden) - a quiet, peaceful place where any bird can find refuge *(Pleroma)*
|
||||
* [stop.voring.me](https://stop.voring.me) - fun hangout for furries and normies alike *(Calckey)* *(hCaptcha)*
|
||||
* [stop.voring.me](https://stop.voring.me) - fun hangout for furries and normies alike *(Firefish)* *(hCaptcha)*
|
||||
|
||||
### 🙏 [Religion](#religion)
|
||||
* [elizur.me](https://elizur.me) - for German-speaking Christians *(Mastodon)*
|
||||
|
|
@ -249,10 +236,8 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [social.yesterweb.org](https://social.yesterweb.org) - hosted in the USA, mainly in English *(Mastodon)*
|
||||
* [wetdry.world](https://wetdry.world) - talk about tech, gaming, bad jokes *(Mastodon)*
|
||||
* [masto.bike](https://masto.bike) - riding a bike is a plus, French speaking *(Mastodon)*
|
||||
* [astronomique.de](https://astronomique.de) - main language is German *(Mastodon)*
|
||||
* [blueplanet.social](https://blueplanet.social) - for people interested in making this planet a better place, primarily German language
|
||||
* [convo.casa](https://convo.casa) - general for everyone *(Mastodon)*
|
||||
* [mstodon.eu](https://mstodon.eu) - EU based English language server *(Mastodon)*
|
||||
* [publicsquare.global](https://publicsquare.global) - safe place in Fediverse dedicated to providing online communication as a basic human right *(Mastodon)* *(Cloudflared)*
|
||||
|
||||
### 🐚 [Run by tech-savvy organizations](#run-by-tech-savvy-organizations)
|
||||
|
|
@ -308,7 +293,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [krefeld.life](https://krefeld.life) - Krefeld, Germany *(Mastodon)*
|
||||
* [darmstadt.social](https://darmstadt.social) - Darmstadt, Germany *(Mastodon)*
|
||||
* [snabelen.no](https://snabelen.no) - Norway *(Mastodon)*
|
||||
* [mastodon.se](https://mastodon.se) - Sweden *(Mastodon)*
|
||||
* [tukkers.online](https://tukkers.online) - Twente region, Netherlands *(Mastodon)*
|
||||
* [mastodon.opencloud.lu](https://mastodon.opencloud.lu) - Luxembourg (private and public organisations) *(Mastodon)*
|
||||
* [mastodon.uy](https://mastodon.uy) - Uruguay *(Mastodon)*
|
||||
|
|
@ -329,7 +313,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [dads.cool](https://dads.cool) - anyone with a kid can be a dad *(Mastodon)*
|
||||
* [colorid.es](https://colorid.es)- Spanish LGBTQIA+ / queer instance primarily for Portuguese speakers *(Mastodon)*
|
||||
* [fandom.ink](https://fandom.ink) - for fans and fandoms of all types *(Mastodon)*
|
||||
* [aspiechattr.me](https://aspiechattr.me) - for aspies and other NDs where you can chat to other peeps with ASD, ADHD, and related conditions *(Mastodon)*
|
||||
* [tooting.ch](https://tooting.ch) - generic instance hosted by the FairSocialNet association *(Mastodon)*
|
||||
* [digitalcourage.social](https://digitalcourage.social) - by DigitalCourage *(Mastodon)*
|
||||
* [libretooth.gr](https://libretooth.gr) - by LibreOps, who contribute to (re-)decentralizing the net *(Mastodon)*
|
||||
|
|
@ -367,7 +350,6 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [musicians.today](https://musicians.today) - for musicians of all levels, instruments, regions, languages, and genres *(Mastodon)*
|
||||
* [kalmar.social](https://kalmar.social) - Kalmar region, Sweden *(Mastodon)*
|
||||
* [blasmusik.social](https://blasmusik.social) - specially, but not only for brass musicians, Germany *(Mastodon)*
|
||||
* [poketopia.city](https://poketopia.city) - For Pokémon furries, Pokéfurs. Also transformation and inanimate TF. *(Mastodon)*
|
||||
* [social.seattle.wa.us](https://social.seattle.wa.us) - Seattle *(Mastodon)*
|
||||
* [social.bau-ha.us](https://social.bau-ha.us) - part of CCC family, hosted in Weimar *(Mastodon)*
|
||||
* [poliversity.it](https://poliversity.it) - Italian instance dedicated to the world of science and journalism *(Mastodon)*
|
||||
|
|
@ -392,7 +374,8 @@ Instances run by and for people belonging to minorities and moderated more stric
|
|||
* [hoosier.social](https://hoosier.social) - for residents of Indiana *(Mastodon)*
|
||||
* [dz.social](https://dz.social) - Algeria *(Mastodon)*
|
||||
* [astronomy.city](https://astronomy.city) - for astronomy and astronomy-adjacent users *(Mastodon)*
|
||||
* [paktodon.asia](https://paktodon.asia) - a Pakistani instance for the Global South
|
||||
* [paktodon.asia](https://paktodon.asia) - a Pakistani instance for the Global South *(Mastodon)*
|
||||
* [baudigital.social](https://baudigital.social) - for people in architecture, civil engineering, or urban studies *(Mastodon)*
|
||||
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
|
||||
<defs>
|
||||
|
|
@ -36,3 +37,6 @@
|
|||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
|
||||
<defs>
|
||||
<style>
|
||||
.cls-1 {
|
||||
fill: #462d7a;
|
||||
}
|
||||
|
||||
.cls-2 {
|
||||
stroke: #2c1e50;
|
||||
}
|
||||
|
||||
.cls-2, .cls-3 {
|
||||
stroke-miterlimit: 10;
|
||||
}
|
||||
|
||||
.cls-3 {
|
||||
stroke: #fff;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<g id="Layer_9" data-name="Layer 9">
|
||||
<path class="cls-2" d="M269.3,197.19c-5.77-11.54-85.59,16.83-154.76,27.39-21.09,3.22-38.13,4.31-47.3,4.75-.74,2.91-1.76,7.02-2.87,11.97-1.93,8.6-2.89,12.89-2.6,13.78,3.3,9.95,59.73-.88,99.18-7.64,32.67-5.6,115.14-18.96,114.61-30.77-.03-.69-1.11-4.01-3.27-10.65-1.78-5.47-2.67-8.2-2.98-8.83Z"/>
|
||||
</g>
|
||||
<g id="Layer_6" data-name="Layer 6">
|
||||
<path class="cls-1" d="M115.2,131.89c6.26-6.54,20.19-20.63,42.39-26.14,15.79-3.92,28.51-1.28,33.51,0,83.72,21.41,116.03,201.78,77.79,226.32-10.28,6.6-26.86,2.7-36.77-3.3-32.63-19.78-29.3-72.87-44.44-73.73-5.11-.29-7.15,5.8-20.91,24.94-19.63,27.3-31.49,43.44-49.21,50.87-2.53,1.06-26.91,12.07-41.84,1.23-38.55-28-2.96-155.84,39.49-200.18Zm56.31,10.45c-27.39-.52-46.38,38.21-37.98,54.55,10.09,19.62,65.5,18.26,74.77-3.3,7.21-16.78-11.38-50.77-36.79-51.24Z"/>
|
||||
</g>
|
||||
<g id="Layer_4" data-name="Layer 4">
|
||||
<path d="M68.93,86.51c-6.55,27.74,252.45,113.97,267.56,89.66,9.24-14.87-64.9-83.62-163.53-97.57-39.06-5.52-100.95-5.14-104.03,7.91Z"/>
|
||||
</g>
|
||||
<g id="Layer_5" data-name="Layer 5">
|
||||
<path class="cls-3" d="M138.96,93.76c.41-5.25,6.51-5.74,28.85-19.42,26.97-16.51,28.85-22.38,56.86-40.83,30.07-19.81,48.46-31.94,54.82-26.61,9.72,8.15-25.18,43.33-21.31,99.35,.87,12.61,3.12,17.79-.86,23.01-18.25,23.95-120.07-13.68-118.35-35.5Z"/>
|
||||
</g>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M16.5714 13.7154H1.71429C0.7675 13.7154 0 14.4828 0 15.4296V30.2856C0 31.2324 0.7675 31.9998 1.71429 31.9998H16.5714C17.5182 31.9998 18.2857 31.2324 18.2857 30.2856V15.4296C18.2857 14.4828 17.5182 13.7154 16.5714 13.7154ZM4.57143 27.4287C3.30911 27.4287 2.28571 26.4054 2.28571 25.1432C2.28571 23.8809 3.30911 22.8576 4.57143 22.8576C5.83375 22.8576 6.85714 23.8809 6.85714 25.1432C6.85714 26.4054 5.83375 27.4287 4.57143 27.4287ZM10.2857 27.4287C9.0234 27.4287 8.00001 26.4054 8.00001 25.1432C8.00001 23.8809 9.0234 22.8576 10.2857 22.8576C11.548 22.8576 12.5714 23.8809 12.5714 25.1432C12.5714 26.4054 11.548 27.4287 10.2857 27.4287Z" fill="url(#paint0_linear_1_20)"/>
|
||||
<path d="M16.5714 13.7156H1.71429C0.7675 13.7156 0 14.483 0 15.4297V30.2858C0 31.2325 0.7675 32 1.71429 32H16.5714C17.5182 32 18.2857 31.2325 18.2857 30.2858V15.4297C18.2857 14.483 17.5182 13.7156 16.5714 13.7156ZM4.57143 27.4289C3.30911 27.4289 2.28571 26.4056 2.28571 25.1433C2.28571 23.8811 3.30911 22.8578 4.57143 22.8578C5.83375 22.8578 6.85714 23.8811 6.85714 25.1433C6.85714 26.4056 5.83375 27.4289 4.57143 27.4289ZM10.2857 27.4289C9.0234 27.4289 8.00001 26.4056 8.00001 25.1433C8.00001 23.8811 9.0234 22.8578 10.2857 22.8578C11.548 22.8578 12.5714 23.8811 12.5714 25.1433C12.5714 26.4056 11.548 27.4289 10.2857 27.4289Z" fill="url(#paint1_linear_1_20)"/>
|
||||
|
|
@ -35,3 +36,6 @@
|
|||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M16.5714 13.7154H1.71429C0.7675 13.7154 0 14.4828 0 15.4296V30.2856C0 31.2324 0.7675 31.9998 1.71429 31.9998H16.5714C17.5182 31.9998 18.2857 31.2324 18.2857 30.2856V15.4296C18.2857 14.4828 17.5182 13.7154 16.5714 13.7154ZM4.57143 27.4287C3.30911 27.4287 2.28571 26.4054 2.28571 25.1432C2.28571 23.8809 3.30911 22.8576 4.57143 22.8576C5.83375 22.8576 6.85714 23.8809 6.85714 25.1432C6.85714 26.4054 5.83375 27.4287 4.57143 27.4287ZM10.2857 27.4287C9.0234 27.4287 8.00001 26.4054 8.00001 25.1432C8.00001 23.8809 9.0234 22.8576 10.2857 22.8576C11.548 22.8576 12.5714 23.8809 12.5714 25.1432C12.5714 26.4054 11.548 27.4287 10.2857 27.4287Z" fill="url(#paint0_linear_1_20)"/>
|
||||
<path d="M16.5714 13.7156H1.71429C0.7675 13.7156 0 14.483 0 15.4297V30.2858C0 31.2325 0.7675 32 1.71429 32H16.5714C17.5182 32 18.2857 31.2325 18.2857 30.2858V15.4297C18.2857 14.483 17.5182 13.7156 16.5714 13.7156ZM4.57143 27.4289C3.30911 27.4289 2.28571 26.4056 2.28571 25.1433C2.28571 23.8811 3.30911 22.8578 4.57143 22.8578C5.83375 22.8578 6.85714 23.8811 6.85714 25.1433C6.85714 26.4056 5.83375 27.4289 4.57143 27.4289ZM10.2857 27.4289C9.0234 27.4289 8.00001 26.4056 8.00001 25.1433C8.00001 23.8811 9.0234 22.8578 10.2857 22.8578C11.548 22.8578 12.5714 23.8811 12.5714 25.1433C12.5714 26.4056 11.548 27.4289 10.2857 27.4289Z" fill="url(#paint1_linear_1_20)"/>
|
||||
<path d="M16.5654 11.4242H8.70931C7.76324 11.4242 6.99609 10.6572 6.99609 9.71106V1.85555C6.99609 0.329404 8.84145 -0.434827 9.92056 0.644203L17.7766 8.49972C18.8559 9.57892 18.0915 11.424 16.5652 11.424L16.5654 11.4242Z" fill="url(#paint2_linear_1_20)"/>
|
||||
<path d="M30.2618 25.1432H22.3062C21.3482 25.1432 20.5714 24.3664 20.5714 23.4085V15.4535C20.5714 13.9081 22.44 13.134 23.5328 14.2268L31.4884 22.1818C32.5812 23.2745 31.8073 25.143 30.2616 25.143L30.2618 25.1432Z" fill="url(#paint3_linear_1_20)"/>
|
||||
<path d="M30.2618 11.4279H22.3062C21.3482 11.4279 20.5714 10.6512 20.5714 9.69319V1.73822C20.5714 0.192798 22.44 -0.581255 23.5328 0.511525L31.4884 8.46649C32.5812 9.55927 31.8073 11.4277 30.2616 11.4277L30.2618 11.4279Z" fill="url(#paint4_linear_1_20)"/>
|
||||
<defs>
|
||||
<linearGradient id="paint0_linear_1_20" x1="0.471606" y1="31.5284" x2="26.6497" y2="5.34823" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1_20" x1="9.14286" y1="31.9266" x2="9.14286" y2="24.975" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#DB44DB" stop-opacity="0.3"/>
|
||||
<stop offset="0.11" stop-color="#DB44DB" stop-opacity="0.21"/>
|
||||
<stop offset="0.27" stop-color="#DB44DB" stop-opacity="0.12"/>
|
||||
<stop offset="0.44" stop-color="#DB44DB" stop-opacity="0.05"/>
|
||||
<stop offset="0.65" stop-color="#DB44DB" stop-opacity="0.01"/>
|
||||
<stop offset="1" stop-color="#DB44DB" stop-opacity="0"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1_20" x1="-6.2723" y1="24.6916" x2="20.547" y2="-2.12947" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1_20" x1="7.36249" y1="38.3512" x2="34.2" y2="11.5119" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint4_linear_1_20" x1="0.504457" y1="31.4934" x2="27.3418" y2="4.65415" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
|
|
@ -1,4 +1,5 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
|
|
@ -63,3 +64,6 @@
|
|||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><g fill="#12554C"><path d="M6.191 22.177a1.096 1.096 0 0 0-.309-.211 6.585 6.585 0 0 0-.407-.169 2.146 2.146 0 0 1-.24-.097c-.07-.035-.133-.07-.183-.105s-.091-.077-.112-.126a.291.291 0 0 1-.042-.162c0-.105.035-.183.119-.246s.197-.091.344-.091a1.409 1.409 0 0 1 .716.175c.007.007.021.007.035 0 .014-.007.021-.014.021-.021l.183-.478c.007-.021 0-.035-.014-.049a1.458 1.458 0 0 0-.379-.148 1.892 1.892 0 0 0-.548-.07c-.358 0-.639.084-.85.26-.211.176-.316.415-.316.717a.834.834 0 0 0 .274.639c.084.07.176.133.281.183.105.049.218.091.33.133.112.035.211.077.295.112.084.035.155.077.211.119s.098.091.126.141a.37.37 0 0 1 .042.183.331.331 0 0 1-.126.274c-.091.063-.239.098-.436.098s-.365-.021-.506-.07a1.74 1.74 0 0 1-.33-.133c-.007-.007-.021-.007-.035 0-.014.007-.021.014-.021.021l-.176.478c-.007.014 0 .035.014.049.042.021.091.049.155.077.063.028.141.056.225.077.084.028.19.049.295.063.112.014.239.028.372.028.4 0 .717-.084.927-.246.218-.169.323-.407.323-.71a.972.972 0 0 0-.07-.4.595.595 0 0 0-.188-.295zM8.881 23.351a4.616 4.616 0 0 0-.274-.372 4.55 4.55 0 0 0-.569-.611c.162-.169.33-.337.492-.513.176-.19.337-.372.492-.541.007-.014.014-.028.007-.042a.038.038 0 0 0-.035-.021h-.668c-.014 0-.021.007-.028.014-.049.056-.112.126-.176.204-.07.077-.141.162-.218.246a7.935 7.935 0 0 1-.239.253c-.056.056-.112.112-.162.169v-2.03c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.561.089c-.021 0-.035.021-.035.035v3.513c0 .021.014.042.042.042h.562c.021 0 .042-.014.042-.042v-1.04c.063.049.126.105.19.176a5.087 5.087 0 0 1 .485.583c.07.105.133.204.19.302a.038.038 0 0 0 .035.021h.653a.038.038 0 0 0 .035-.021c.007-.014.007-.028 0-.035a7.51 7.51 0 0 0-.218-.344zM11.256 21.545a1.09 1.09 0 0 0-.386-.267c-.148-.063-.309-.091-.485-.091s-.337.028-.485.091-.274.155-.386.267c-.105.112-.19.253-.253.415a1.61 1.61 0 0 0-.091.534c0 .197.028.379.091.541a1.127 1.127 0 0 0 .625.682c.148.063.309.098.492.098.176 0 .344-.035.492-.098a1.22 1.22 0 0 0 .386-.267c.105-.112.19-.253.246-.415s.084-.344.084-.541c0-.197-.028-.379-.091-.534a1.266 1.266 0 0 0-.239-.415zm-.323.956c0 .239-.049.422-.148.555a.47.47 0 0 1-.4.197c-.176 0-.309-.063-.4-.197-.098-.133-.148-.323-.148-.555s.049-.415.148-.548a.47.47 0 0 1 .4-.197c.176 0 .309.063.4.197.099.126.148.316.148.548zM14.734 20.456h-.583c-.021 0-.042.014-.042.042v1.251h-1.328v-1.251c0-.021-.014-.042-.042-.042h-.583c-.021 0-.042.014-.042.042v3.225c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-1.391h1.321v1.391c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-3.225c0-.028-.014-.042-.035-.042zM17.291 21.243h-.562c-.021 0-.042.014-.042.042v1.939a.644.644 0 0 1-.133.014c-.077.007-.148.007-.211.007-.176 0-.295-.049-.365-.148-.07-.105-.105-.288-.105-.534v-1.272c0-.021-.014-.042-.042-.042h-.562c-.021 0-.042.014-.042.042v1.363c0 .169.014.323.049.464.035.141.098.267.176.372a.908.908 0 0 0 .33.246c.133.056.309.084.506.084.211 0 .4-.014.576-.042.176-.028.316-.056.429-.084.014-.007.028-.021.028-.035v-2.361c.012-.034-.002-.055-.03-.055zM19.989 21.974a1.203 1.203 0 0 0-.211-.415.887.887 0 0 0-.351-.267 1.131 1.131 0 0 0-.471-.091 1.164 1.164 0 0 0-.513.112v-1.201c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.562.091c-.021 0-.035.021-.035.035v3.443c0 .014.014.035.028.035.112.035.253.063.429.091.169.028.351.042.541.042.197 0 .372-.028.527-.091a1.05 1.05 0 0 0 .4-.267c.112-.112.197-.253.253-.415s.091-.344.091-.541a2.068 2.068 0 0 0-.084-.526zm-.576.52c0 .239-.056.429-.169.562a.558.558 0 0 1-.457.197c-.091 0-.162-.007-.225-.014a1.312 1.312 0 0 1-.119-.021v-1.349a.742.742 0 0 1 .169-.077.738.738 0 0 1 .253-.042c.19 0 .33.063.415.19.084.139.133.322.133.554z"/></g><path fill="#18968C" d="M17.467 9.054 8.073 3.538C7.16 2.997 5.776 2.007 5.516.384l-.625 1.103c-1.974 3.471.478 5.339 1.869 6.147l9.393 5.522c.913.534 2.297 1.532 2.557 3.147l.625-1.103c1.968-3.463-.484-5.331-1.868-6.146zM4.146 10.136v2.192a3.995 3.995 0 0 0 3.984 3.984h5.051l-6.78-3.984c-.723-.422-1.728-1.125-2.255-2.192zM16.09.384h-5.051l6.78 3.984c.717.422 1.721 1.124 2.248 2.185V4.367A3.984 3.984 0 0 0 16.09.384z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><g fill="#12554C"><path d="M6.191 22.177a1.096 1.096 0 0 0-.309-.211 6.585 6.585 0 0 0-.407-.169 2.146 2.146 0 0 1-.24-.097c-.07-.035-.133-.07-.183-.105s-.091-.077-.112-.126a.291.291 0 0 1-.042-.162c0-.105.035-.183.119-.246s.197-.091.344-.091a1.409 1.409 0 0 1 .716.175c.007.007.021.007.035 0 .014-.007.021-.014.021-.021l.183-.478c.007-.021 0-.035-.014-.049a1.458 1.458 0 0 0-.379-.148 1.892 1.892 0 0 0-.548-.07c-.358 0-.639.084-.85.26-.211.176-.316.415-.316.717a.834.834 0 0 0 .274.639c.084.07.176.133.281.183.105.049.218.091.33.133.112.035.211.077.295.112.084.035.155.077.211.119s.098.091.126.141a.37.37 0 0 1 .042.183.331.331 0 0 1-.126.274c-.091.063-.239.098-.436.098s-.365-.021-.506-.07a1.74 1.74 0 0 1-.33-.133c-.007-.007-.021-.007-.035 0-.014.007-.021.014-.021.021l-.176.478c-.007.014 0 .035.014.049.042.021.091.049.155.077.063.028.141.056.225.077.084.028.19.049.295.063.112.014.239.028.372.028.4 0 .717-.084.927-.246.218-.169.323-.407.323-.71a.972.972 0 0 0-.07-.4.595.595 0 0 0-.188-.295zM8.881 23.351a4.616 4.616 0 0 0-.274-.372 4.55 4.55 0 0 0-.569-.611c.162-.169.33-.337.492-.513.176-.19.337-.372.492-.541.007-.014.014-.028.007-.042a.038.038 0 0 0-.035-.021h-.668c-.014 0-.021.007-.028.014-.049.056-.112.126-.176.204-.07.077-.141.162-.218.246a7.935 7.935 0 0 1-.239.253c-.056.056-.112.112-.162.169v-2.03c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.561.089c-.021 0-.035.021-.035.035v3.513c0 .021.014.042.042.042h.562c.021 0 .042-.014.042-.042v-1.04c.063.049.126.105.19.176a5.087 5.087 0 0 1 .485.583c.07.105.133.204.19.302a.038.038 0 0 0 .035.021h.653a.038.038 0 0 0 .035-.021c.007-.014.007-.028 0-.035a7.51 7.51 0 0 0-.218-.344zM11.256 21.545a1.09 1.09 0 0 0-.386-.267c-.148-.063-.309-.091-.485-.091s-.337.028-.485.091-.274.155-.386.267c-.105.112-.19.253-.253.415a1.61 1.61 0 0 0-.091.534c0 .197.028.379.091.541a1.127 1.127 0 0 0 .625.682c.148.063.309.098.492.098.176 0 .344-.035.492-.098a1.22 1.22 0 0 0 .386-.267c.105-.112.19-.253.246-.415s.084-.344.084-.541c0-.197-.028-.379-.091-.534a1.266 1.266 0 0 0-.239-.415zm-.323.956c0 .239-.049.422-.148.555a.47.47 0 0 1-.4.197c-.176 0-.309-.063-.4-.197-.098-.133-.148-.323-.148-.555s.049-.415.148-.548a.47.47 0 0 1 .4-.197c.176 0 .309.063.4.197.099.126.148.316.148.548zM14.734 20.456h-.583c-.021 0-.042.014-.042.042v1.251h-1.328v-1.251c0-.021-.014-.042-.042-.042h-.583c-.021 0-.042.014-.042.042v3.225c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-1.391h1.321v1.391c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-3.225c0-.028-.014-.042-.035-.042zM17.291 21.243h-.562c-.021 0-.042.014-.042.042v1.939a.644.644 0 0 1-.133.014c-.077.007-.148.007-.211.007-.176 0-.295-.049-.365-.148-.07-.105-.105-.288-.105-.534v-1.272c0-.021-.014-.042-.042-.042h-.562c-.021 0-.042.014-.042.042v1.363c0 .169.014.323.049.464.035.141.098.267.176.372a.908.908 0 0 0 .33.246c.133.056.309.084.506.084.211 0 .4-.014.576-.042.176-.028.316-.056.429-.084.014-.007.028-.021.028-.035v-2.361c.012-.034-.002-.055-.03-.055zM19.989 21.974a1.203 1.203 0 0 0-.211-.415.887.887 0 0 0-.351-.267 1.131 1.131 0 0 0-.471-.091 1.164 1.164 0 0 0-.513.112v-1.201c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.562.091c-.021 0-.035.021-.035.035v3.443c0 .014.014.035.028.035.112.035.253.063.429.091.169.028.351.042.541.042.197 0 .372-.028.527-.091a1.05 1.05 0 0 0 .4-.267c.112-.112.197-.253.253-.415s.091-.344.091-.541a2.068 2.068 0 0 0-.084-.526zm-.576.52c0 .239-.056.429-.169.562a.558.558 0 0 1-.457.197c-.091 0-.162-.007-.225-.014a1.312 1.312 0 0 1-.119-.021v-1.349a.742.742 0 0 1 .169-.077.738.738 0 0 1 .253-.042c.19 0 .33.063.415.19.084.139.133.322.133.554z"/></g><path fill="#18968C" d="M17.467 9.054 8.073 3.538C7.16 2.997 5.776 2.007 5.516.384l-.625 1.103c-1.974 3.471.478 5.339 1.869 6.147l9.393 5.522c.913.534 2.297 1.532 2.557 3.147l.625-1.103c1.968-3.463-.484-5.331-1.868-6.146zM4.146 10.136v2.192a3.995 3.995 0 0 0 3.984 3.984h5.051l-6.78-3.984c-.723-.422-1.728-1.125-2.255-2.192zM16.09.384h-5.051l6.78 3.984c.717.422 1.721 1.124 2.248 2.185V4.367A3.984 3.984 0 0 0 16.09.384z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
|
|
@ -130,3 +131,6 @@
|
|||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="84.365" y1="-76.858" x2="79.068" y2="-82.126" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#153e4b"/><stop offset="1" style="stop-color:#0c2b3d"/></linearGradient><path fill="url(#a)" d="M3.168.224h17.664a2.944 2.944 0 0 1 2.944 2.944v17.664a2.944 2.944 0 0 1-2.944 2.944H3.168a2.944 2.944 0 0 1-2.944-2.944V3.168A2.944 2.944 0 0 1 3.168.224z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="80.686" y1="-78.204" x2="79.591" y2="-82.42" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#046bab"/><stop offset="1" style="stop-color:#058"/></linearGradient><path fill="url(#b)" d="M.224 6.258s1.389-1.36 4.177-1.91c3.021-.596 5.713 0 5.713 0l2.603 2.606-.155 7.852s1.806 2.956.707 3.075c-2.321.252-2.893 2.884-2.438 4.39.455 1.505.377 1.505.377 1.505H.223V6.258z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="82.154" y1="-78.007" x2="81.908" y2="-79.348" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#f15628"/><stop offset="1" style="stop-color:#ce3b27"/></linearGradient><path fill="url(#c)" d="M10.114 4.348s1.291 4.511 1.155 6.781c-.137 2.27-.438 2.407-.438 2.407L17.19 9.06c-1.382-1.645-4.307-4.154-7.076-4.712z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="82.292" y1="-79.933" x2="82.998" y2="-80.895" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#e0d69b"/><stop offset="1" style="stop-color:#d1c572"/></linearGradient><path fill="url(#d)" d="M10.831 13.536 17.19 9.06s1.491 1.346 2.953 3.62c1.393 2.166 2.488 5.02 2.488 5.02s-3.153-.296-5.905-.262c-4.025.05-5.777.695-5.777.695-.835-1.92-.835-2.678-.118-4.597z"/><circle fill="#FFF" cx="8.404" cy="11.692" r="1.489"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="84.365" y1="-76.858" x2="79.068" y2="-82.126" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#153e4b"/><stop offset="1" style="stop-color:#0c2b3d"/></linearGradient><path fill="url(#a)" d="M3.168.224h17.664a2.944 2.944 0 0 1 2.944 2.944v17.664a2.944 2.944 0 0 1-2.944 2.944H3.168a2.944 2.944 0 0 1-2.944-2.944V3.168A2.944 2.944 0 0 1 3.168.224z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="80.686" y1="-78.204" x2="79.591" y2="-82.42" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#046bab"/><stop offset="1" style="stop-color:#058"/></linearGradient><path fill="url(#b)" d="M.224 6.258s1.389-1.36 4.177-1.91c3.021-.596 5.713 0 5.713 0l2.603 2.606-.155 7.852s1.806 2.956.707 3.075c-2.321.252-2.893 2.884-2.438 4.39.455 1.505.377 1.505.377 1.505H.223V6.258z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="82.154" y1="-78.007" x2="81.908" y2="-79.348" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#f15628"/><stop offset="1" style="stop-color:#ce3b27"/></linearGradient><path fill="url(#c)" d="M10.114 4.348s1.291 4.511 1.155 6.781c-.137 2.27-.438 2.407-.438 2.407L17.19 9.06c-1.382-1.645-4.307-4.154-7.076-4.712z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="82.292" y1="-79.933" x2="82.998" y2="-80.895" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#e0d69b"/><stop offset="1" style="stop-color:#d1c572"/></linearGradient><path fill="url(#d)" d="M10.831 13.536 17.19 9.06s1.491 1.346 2.953 3.62c1.393 2.166 2.488 5.02 2.488 5.02s-3.153-.296-5.905-.262c-4.025.05-5.777.695-5.777.695-.835-1.92-.835-2.678-.118-4.597z"/><circle fill="#FFF" cx="8.404" cy="11.692" r="1.489"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
|
|
|
|||
|
|
@ -99,15 +99,11 @@ howto: How to Mastodon
|
|||
guide: Guide
|
||||
awesome: Awesome Mastodon list
|
||||
backup: Mastodon backup
|
||||
metrics: metrics
|
||||
stats: statistics
|
||||
graphs: graphs
|
||||
webmentions: Webmentions - site + Fediverse bridge
|
||||
mastofeed: Mastofeed
|
||||
crossposting: Mastodon-Twitter crossposting
|
||||
twitodon: Find and follow Twitter friends on Mastodon
|
||||
fediDir: Curated list of interesting accounts
|
||||
feedPreview: Instance timeline preview
|
||||
feed2toot: RSS to Mastodon bot
|
||||
trunk: Trunk - follow users with common interests
|
||||
moa: Twitter cross-poster
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@
|
|||
</li>
|
||||
<% } %>
|
||||
</ul>
|
||||
<% if (data.serverWizard) { %>
|
||||
<p><svg class="f-highlight <%- network %>" role="img" aria-labelledby="f-snow" style="position: relative"><title id="f-snow">network logo colour icon</title><use xlink:href="#icon-snowflake"></use></svg> Or use a wizard to help you pick a server from the list:</p>
|
||||
<a href="<%= data.serverWizard %>" class="u-block u-emphasize btn-action u-center"><%- __('wizard') %></a>
|
||||
<% } %>
|
||||
<% if (data.mobile) { %>
|
||||
<p><svg class="f-highlight <%- network %>" role="img" aria-labelledby="f-snow" style="position: relative"><title id="f-snow">network logo colour icon</title><use xlink:href="#icon-snowflake"></use></svg> Choose a mobile application from the available ones:</p>
|
||||
<div class="server-list"><a href="<%= data.mobile %>"><%- __('mobapps') %></a></div>
|
||||
|
|
|
|||
|
|
@ -8,10 +8,9 @@ network: true
|
|||
const data = site.data.mastodon.data;
|
||||
const tuts = [__('howto'), __('guide')];
|
||||
const uxList = [__('pinafore'), __('halcyon'), __('twitodon'), __('trunk'), __('fediDir')];
|
||||
const stats = [__('stats')];
|
||||
const tech = [__('awesome'), __('backup')];
|
||||
const tools = [__('preinstalled'), __('mediaHosting')];
|
||||
const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot'), __('moa'), __('pleromaBot')];
|
||||
const utils = [__('mastofeed'), __('feed2toot'), __('pleromaBot')];
|
||||
%>
|
||||
|
||||
<%- partial('_partial/heroheader') %>
|
||||
|
|
@ -92,17 +91,6 @@ network: true
|
|||
<% } %>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section u-block inline-items">
|
||||
<h4><%- __('metrics') %></h4>
|
||||
<ul class="section-list">
|
||||
<% for (item in data.metrics) { %>
|
||||
<% let s = data.metrics[item].id %>
|
||||
<li class="u-inline">
|
||||
<a href="<%= data.metrics[item].url %>"><%= stats[s] %></a><span> / </span>
|
||||
</li>
|
||||
<% } %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import requests
|
|||
SOFTWARES = ['diaspora', 'friendica', 'hubzilla', 'mastodon', 'gnusocial',
|
||||
'pleroma', 'misskey', 'peertube', 'pixelfed', 'funkwhale',
|
||||
'writefreely', 'plume', 'mobilizon', 'lemmy', 'gotosocial',
|
||||
'owncast', 'bookwyrm', 'microblogpub', 'akkoma', 'calckey',
|
||||
'owncast', 'bookwyrm', 'microblogpub', 'akkoma', 'firefish',
|
||||
'hometown']
|
||||
|
||||
def number_to_string(number):
|
||||
|
|
|
|||
Loading…
Reference in New Issue