Skip to content

Commit bf6783b

Browse files
hrefhrefhrefhref
committed
resources, directory, ...
1 parent 2a8ee2a commit bf6783b

32 files changed

+342
-42
lines changed

‎.travis.yml

+17-16
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,24 @@ branches:
66
only:
77
- master
88
before_script:
9-
- echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
9+
- echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
10+
- ./refresh_data.sh
1011
after_success:
11-
- openssl aes-256-cbc -K $encrypted_8c0295a6c6f0_key -iv $encrypted_8c0295a6c6f0_iv -in .travis/deploy_rsa.enc -out .travis/deploy_rsa -d
12-
- chmod 600 .travis/deploy_rsa
13-
- eval `ssh-agent -s`
14-
- ssh-add .travis/deploy_rsa
15-
- rm -rf _deploy
16-
- mkdir _deploy
17-
- cd _deploy
18-
- git clone https://github.com/ialisme/fed.ialis.me.git --branch=gh-pages .
19-
- git remote add deploy [email protected]:ialisme/fed.ialis.me.git
20-
- rsync -avzh ../_site/ ./
21-
- git add .
22-
- git config --global user.name "$GIT_NAME"
23-
- git config --global user.email "$GIT_EMAIL"
24-
- git commit -m "New site version. Committed by Travis-CI."
25-
- git push deploy gh-pages
12+
- openssl aes-256-cbc -K $encrypted_8c0295a6c6f0_key -iv $encrypted_8c0295a6c6f0_iv -in .travis/deploy_rsa.enc -out .travis/deploy_rsa -d
13+
- chmod 600 .travis/deploy_rsa
14+
- eval `ssh-agent -s`
15+
- ssh-add .travis/deploy_rsa
16+
- rm -rf _deploy
17+
- mkdir _deploy
18+
- cd _deploy
19+
- git clone https://github.com/ialisme/fed.ialis.me.git --branch=gh-pages .
20+
- git remote add deploy [email protected]:ialisme/fed.ialis.me.git
21+
- rsync -avzh ../_site/ ./
22+
- git add .
23+
- git config --global user.name "$GIT_NAME"
24+
- git config --global user.email "$GIT_EMAIL"
25+
- git commit -m "Deployed website updates via travis-ci."
26+
- git push deploy gh-pages
2627
notifications:
2728
irc:
2829
on_success: change

‎Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: git://github.com/hrefhref/jekyll-multiple-languages-plugin.git
3-
revision: 4f9c362eb6e9f9884232a60dd98c1f1072a2c77e
3+
revision: 00a1afa6b1733cb154976a8032fde0e2bdff1849
44
specs:
55
jekyll-multiple-languages-plugin (1.5.1)
66
jekyll (>= 2.0, < 4.0)

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
**WIP**
44

5+
<img src="https://raw.githubusercontent.com/ialisme/fed.ialis.me/master/assets/images/header_outline.png" />
6+
57
Content and sources are licensed in the public domain / [Unlicense](http://unlicense.org).
68

79
As the website is a work in progress right now we invite all repo collaborators to just work in `master` branch. Once

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ gems:
33

44
title: The Guide To The Fediverse
55
email: [email protected]
6-
description: "A guide to the fediverse and its different versions (Mastodon, GNUSocial, ...)."
6+
description: "A guide to the fediverse, an open, free and decentralized social microblogging network and its different versions (Mastodon, GNUSocial, ...)."
77
baseurl: ""
88
url: "https://fed.ialis.me"
99

‎_data/apps.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@
2929
name: Toot
3030
link: https://github.com/ihabunek/toot
3131
source: https://github.com/ihabunek/toot
32-
32+
- id: madonctl
33+
name: madonctl
34+
link: https://lilotux.net/~mikael/pub/madonctl/
35+
source: https://github.com/McKael/madonctl
3336

‎_data/directory.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
"[email protected]":
2+
name: Translator Bot
3+
lang: all
4+
tags:
5+
- bots
6+
7+
"[email protected]":
8+
name: User Count Bot
9+
lang: en
10+
tags:
11+
- bots
12+
- meta
13+
14+
"[email protected]":
15+
name: Big Ben Bot
16+
lang: en
17+
tags:
18+
- bots
19+
20+
"[email protected]":
21+
name: NASA
22+
lang: en
23+
tags:
24+
- bots
25+
- mirrors
26+
27+
"[email protected]":
28+
name: LesJours.fr
29+
lang: fr
30+
tags:
31+
- news
32+
33+
"[email protected]":
34+
name: Mastodon.ART Curator
35+
lang: en
36+
tags:
37+
- curators
38+

‎_data/directory_tags.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- bots
2+
- mirrors
3+
- meta
4+
- news
5+
- curators

‎_data/resources.yml

+26-11
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,78 @@
11
-
2+
id: mastoguide
23
name: "Mastodon User Guide"
34
lang: en
45
link: http://mastoguide.info
56
categories:
67
- guides
8+
- mastodon
79

8-
- name: "Mastodon Wiki (english)"
10+
- id: mstdn_wiki_en
11+
name: "Mastodon Wiki (english)"
912
lang: en
1013
link: http://en.mstdn.wiki/Main_Page
1114
categories:
1215
- guides
16+
- mastodon
1317

14-
- name: "Mastodon Wiki (french)"
18+
- id: mstdn_wiki_fr
19+
name: "Mastodon Wiki (french)"
1520
lang: fr
1621
link: http://fr.mstdn.wiki/Main_Page
1722
categories:
1823
- guides
24+
- mastodon
1925

20-
- name: "Mastodon Wiki (japanese)"
26+
- id: mstdn_wiki_ja
27+
name: "Mastodon Wiki (japanese)"
2128
lang: ja
2229
link: http://ja.mstdn.wiki/Main_Page
2330
categories:
2431
- guides
32+
- mastodon
2533

26-
27-
- name: "Mastodon Instances list"
34+
- id: mastodon_list
35+
name: "Mastodon Instances list"
2836
lang: en
2937
link: https://instances.mastodon.xyz/list
3038
categories:
3139
- fediverse
40+
- mastodon
3241

33-
- name: "Fediverse Radar"
42+
- id: amberstone_radar
43+
name: "Fediverse Radar"
3444
lang: en
3545
link: https://radar.amberstone.digital/
3646
categories:
3747
- fediverse
3848

39-
40-
- name: "Tuskr"
49+
- id: tuskr
50+
name: "Tuskr"
4151
lang: en
4252
link: http://tuskr.xyz
4353
categories:
4454
- search
4555

46-
- name: "Mastory - Mastodon user directory"
56+
- id: mastory
57+
name: "Mastory - Mastodon user directory"
4758
lang: en
4859
link: http://mastory.social/
4960
categories:
5061
- search
5162

52-
- name: "dlvrit - toot to tweets"
63+
- id: dlvrit
64+
name: "dlvrit - toot to tweets"
5365
lang: en
5466
link: https://dlvrit.com/
5567
categories:
5668
- tools
69+
- mastodon
5770

58-
- name: "mastofeed - embedded mastodon"
71+
- id: mastofeed
72+
name: "mastofeed - embedded mastodon"
5973
lang: en
6074
link: https://www.mastofeed.com/
6175
categories:
6276
- tools
77+
- mastodon
6378

‎_i18n/en.yml

+20-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ global:
55
opensource: Open Source
66
free: Free
77
langs:
8+
all: Any
89
en: English
9-
fr: Français
10+
fr: French
1011
categories:
1112
guides: Guides
1213
instances: Instances
@@ -15,6 +16,7 @@ categories:
1516
news: News
1617
servers: Servers
1718
resources: Resources
19+
directory: Directory
1820

1921
pages:
2022
index: Home
@@ -35,6 +37,12 @@ titles:
3537
mastodon_apps: Applications for Mastodon
3638
protocols: OStatus - Standards protocols
3739
resources: Resources
40+
directory: Directory
41+
directory_bots: Bots
42+
directory_mirrors: Mirrors
43+
directory_news: News
44+
directory_curators: Curators
45+
directory_meta: Meta
3846

3947
descriptions:
4048
protocols: The standardized technology behind the federation
@@ -61,3 +69,14 @@ resources:
6169
tools: Tools
6270
search: Search
6371
guides: Guides
72+
73+
directory:
74+
tags:
75+
all: All
76+
bots: Bots
77+
mirrors: Mirrors
78+
meta: Meta
79+
news: News
80+
curators: Curators
81+
82+

‎_i18n/en/directory/content.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
A non exhaustive list of bots, tools, news and mirrors account on the Fediverse to get you started.
2+

‎_i18n/en/index/introduction.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The fediverse is a **decentralized, federated**, social micro-blogging network, similar to Twitter.
22

33
It is made of a multitude of independent <a href="{% tl instances %}">instances</a>, running on different <a href="{% tl servers
4-
%}">software</a> (such as Mastodon or GNU Social) and **federated** by a set of <a href="{% tl protocols %}">standardized protocols</a>.
4+
%}">software</a> (such as Mastodon or GNU Social) and **federated** by _OStatus_, a set of <a href="{% tl protocols %}">standardized protocols</a>.
55

66
**This website is a work of progress and not ready for prime time.** Most link don't work yet.
77

‎_i18n/fr.yml

+30-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ global:
55
opensource: Source ouverte
66
free: Gratuit
77
langs:
8-
en: English
8+
all: Toutes
9+
en: Anglais
910
fr: Français
1011
categories:
1112
guides: Guides
1213
instances: Instances
1314
tools: Outils
1415
apps: Applications
1516
news: Actualité
17+
servers: Serveurs
18+
resources: Ressources
19+
directory: Répertoire
1620

1721
pages:
1822
index: Accueil
@@ -30,6 +34,15 @@ titles:
3034
admin: Guides de l'Administrateur
3135
servers: Serveurs
3236
mastodon_tools: Outils pour Mastodon
37+
mastodon_apps: Applications pour Mastodon
38+
protocols: OStatus - Protocoles standards
39+
resources: Ressources
40+
directory: Répertoire
41+
directory_bots: Robots
42+
directory_mirrors: Relais
43+
directory_news: Actualités
44+
directory_curators: Curateurs
45+
directory_meta: Meta
3346

3447
index:
3548
title: Bienvenue sur le Fediverse
@@ -40,3 +53,19 @@ apps:
4053
platforms:
4154
ios: Pour iOS (iPhone, iPad)
4255
android: Pour Android
56+
terminal: Invite de commande
57+
58+
resources:
59+
categories:
60+
tools: Outils
61+
search: Recherche
62+
guides: Guides
63+
64+
directory:
65+
tags:
66+
all: Tout
67+
bots: Robots
68+
mirrors: Relais
69+
meta: Meta
70+
news: Actualités
71+
curators: Curateurs

‎_i18n/fr/directory/content.md

Whitespace-only changes.

‎_includes/header.html

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<a href="{% tl page.category %}">{% t categories.{{ page.category }} %}</a> /
1717
{% endif %}{% endif %}
1818
</p>
19+
<br/>
1920
<h1 class="title">
2021
{% t page.title %}
2122
</h1>

‎_includes/header_menu.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container">
33
<div class="nav-left">
44
<a href="{% tl index %}" class="nav-item is-tab {% if page.category == 'index' %}is-active{% endif %}">
5-
fed.ialis.me
5+
<strong>fed.ialis.me</strong>
66
</a>
77
</div>
88
<span class="nav-toggle">
@@ -23,6 +23,9 @@
2323
<a href="{% tl resources %}" class="nav-item is-tab {% if page.category == 'resources' %}is-active{% endif %}">
2424
{% t categories.resources %}
2525
</a>
26+
<a href="{% tl directory %}" class="nav-item is-tab {% if page.category == 'directory' %}is-active{% endif %}">
27+
{% t categories.directory %}
28+
</a>
2629
<a href="{% tl news %}" class="nav-item is-tab {% if page.category == 'news' %}is-active{% endif %}">
2730
{% t categories.news %}
2831
</a>

‎_includes/lang_pickers.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% for lang in site.data.i18n.lang_pickers %}
2-
<div class="message message-translation" id="lang-picker-{{ lang[0] }}">
2+
<div class="message message-translation mg-top-10" id="lang-picker-{{ lang[0] }}">
33
<div class="message-body has-text-centered is-small">
44
<a href="{% tl {{ page.namespace }} {{ lang[0] }} %}">{{ lang[1] }}</a>
55
</div>

0 commit comments

Comments
 (0)