From 0005b49faf7547b8cfd7a27a7b926431e58ba8dd Mon Sep 17 00:00:00 2001 From: codl Date: Thu, 13 Apr 2017 10:28:50 +0200 Subject: [PATCH 1/5] example nginx: remove includeSubDomains from hsts --- Running-Mastodon/Production-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Running-Mastodon/Production-guide.md b/Running-Mastodon/Production-guide.md index 4c80d606..751be67d 100644 --- a/Running-Mastodon/Production-guide.md +++ b/Running-Mastodon/Production-guide.md @@ -47,7 +47,7 @@ server { gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains"; + add_header Strict-Transport-Security "max-age=31536000"; location / { try_files $uri @proxy; From ff76793c057a4b54ee371235cb772484ed30a727 Mon Sep 17 00:00:00 2001 From: woachk Date: Thu, 13 Apr 2017 13:01:00 +0200 Subject: [PATCH 2/5] Update app list Add my experimental Windows 10 app ;) --- Using-Mastodon/Apps.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md index 646b728e..ca5d41ff 100644 --- a/Using-Mastodon/Apps.md +++ b/Using-Mastodon/Apps.md @@ -15,5 +15,6 @@ Some people have started working on apps for the Mastodon API. Here is a list of |tootstream|CLI||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)| |HackerNewsBot|CLI||[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)| |Mastodon.tools|Wordpress, web browser, social network||[@David@mastodon.xyz](https://mastodon.xyz/users/David)| +|[Mastodon UWP](https://github.com/woachk/mastodon/releases)|Windows 10||[@my123@mastodon.social](https://mastodon.social/users/my123)| If you have a project like this, let me know so I can add it to the list! From e3991fa4f8ded6b87aca27c1ebd80753e0b76683 Mon Sep 17 00:00:00 2001 From: slipstream/RoL Date: Thu, 13 Apr 2017 14:52:44 +0100 Subject: [PATCH 3/5] Fix broken links Fixed broken links due to documentation being in its own repo now. --- Contributing-to-Mastodon/Translating.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Contributing-to-Mastodon/Translating.md b/Contributing-to-Mastodon/Translating.md index 3453a1d3..2f10d555 100644 --- a/Contributing-to-Mastodon/Translating.md +++ b/Contributing-to-Mastodon/Translating.md @@ -30,10 +30,10 @@ The locales are mentioned in several other files. To activate your translation, | File | Location | Comment | |---|---|---| -| [`index.jsx`](/app/assets/javascripts/components/locales/index.jsx) | `app/assets/javascripts/components/locales/index.jsx` | 2 lines to add | -|[`mastodon.jsx`](/app/assets/javascripts/components/containers/mastodon.jsx) | `app/assets/javascripts/components/containers/mastodon.jsx` | 1 line to add + 1 list to complete | -| [`settings_helper.rb`](/app/helpers/settings_helper.rb) | `app/helpers/settings_helper.rb` | 1 line to add + your language’s name | -| [`application.rb`](/config/application.rb) | `config/application.rb` | 1 list to complete | +| [`index.jsx`](https://github.com/tootsuite/mastodon/blob/master/app/assets/javascripts/components/locales/index.jsx) | `app/assets/javascripts/components/locales/index.jsx` | 2 lines to add | +|[`mastodon.jsx`](https://github.com/tootsuite/mastodon/blob/master/app/assets/javascripts/components/containers/mastodon.jsx) | `app/assets/javascripts/components/containers/mastodon.jsx` | 1 line to add + 1 list to complete | +| [`settings_helper.rb`](https://github.com/tootsuite/mastodon/blob/master/app/helpers/settings_helper.rb) | `app/helpers/settings_helper.rb` | 1 line to add + your language’s name | +| [`application.rb`](https://github.com/tootsuite/mastodon/blob/master/config/application.rb) | `config/application.rb` | 1 list to complete | ## Sending the translation From a1b758dfd89ef04409f41a8cd90e71d811452020 Mon Sep 17 00:00:00 2001 From: ThomasChln Date: Thu, 13 Apr 2017 16:18:43 +0200 Subject: [PATCH 4/5] Update API.md --- Using-the-API/API.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-the-API/API.md b/Using-the-API/API.md index fee1fde9..a8205ed3 100644 --- a/Using-the-API/API.md +++ b/Using-the-API/API.md @@ -44,6 +44,7 @@ ___ - [For JavaScript](https://github.com/Zatnosk/libodonjs) - [For JavaScript (Node.js)](https://github.com/jessicahayley/node-mastodon) - [For Elixir](https://github.com/milmazz/hunter) +- [For R](https://github.com/ThomasChln/mastodon) ___ From d5b0db2e5eb410511cc5a9478f6b8b85e2d3c665 Mon Sep 17 00:00:00 2001 From: woachk Date: Thu, 13 Apr 2017 19:00:02 +0200 Subject: [PATCH 5/5] Update app list Note that the app is in a beta state right now. --- Using-Mastodon/Apps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md index ca5d41ff..e80dbe96 100644 --- a/Using-Mastodon/Apps.md +++ b/Using-Mastodon/Apps.md @@ -15,6 +15,6 @@ Some people have started working on apps for the Mastodon API. Here is a list of |tootstream|CLI||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)| |HackerNewsBot|CLI||[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)| |Mastodon.tools|Wordpress, web browser, social network||[@David@mastodon.xyz](https://mastodon.xyz/users/David)| -|[Mastodon UWP](https://github.com/woachk/mastodon/releases)|Windows 10||[@my123@mastodon.social](https://mastodon.social/users/my123)| +|[Mastodon UWP (beta)](https://github.com/woachk/mastodon/releases)|Windows 10||[@my123@mastodon.social](https://mastodon.social/users/my123)| If you have a project like this, let me know so I can add it to the list!