Commit graph

153 commits

Author SHA1 Message Date
Kody
41f34e7412 Added im-in.space 2017-04-05 17:00:03 +02:00
Eugen
b89f37e445 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Jonathan Hurter
8752dc9186 Add doc 2017-04-05 16:00:48 +02:00
Eugen
437bc1880b Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
676763dbc8 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Padraig Fahy
9efa03d2be Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
3a39a67901 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
Eugen
db522ed61a Merge pull request #931 from farlistener/patch-3
Typography on partY
2017-04-05 14:57:14 +02:00
wxcafé
37bd8d45ed Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Angristan
0bd1bdfc44 Add git and curl as dependencies
In some VPS templates, they are not installed by default.
2017-04-05 14:11:08 +02:00
Cédric Levieux
06d3e7dbba Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
6ea25d695a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
7395c62367 Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
dd4cec6699 Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Eugen
786dabefed Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00
Cédric Levieux
9e06446d65 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
17fb783672 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
3a98afd3e9 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Angristan
53a01b38b2 ECDH only
Disable DHE ciphers. We don't loose any compatibility as we already use TLS 1.2, and ECDH is faster and safer.
Also, it's better so specify the curve.

This is the conf I use here : https://tls.imirhil.fr/https/mstdn.io
2017-04-05 10:44:08 +02:00
Eugen
3975f92b8d Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
f8fd1e8a29 Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Eugen
4d46908556 Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
Eugen
b41e48ffe4 Merge pull request #902 from asm/ssl_best_practices
SSL best practices for nginx
2017-04-05 10:26:32 +02:00
Eugen
1f7dccf535 Fix API method URL typo 2017-04-05 10:25:05 +02:00
Ian McDowell
628dfbb363 Update List-of-Mastodon-instances.md
Added mastodon.network.
2017-04-04 23:43:57 -05:00
scriptjunkie
940dedab78 Add https://securitymastod.one/ 2017-04-04 23:23:15 -05:00
shel
b6a6a0d3d9 Corrected misinformation regarding Direct Posts
Unless something changed recently I have no clue why this said that direct posts do not federate because they do.
2017-04-04 21:47:13 -04:00
Jason Snell
413d87cd50 SSL best practices for nginx 2017-04-04 18:43:21 -07:00
Ash Furrow
026dafe912 Adds mastodon.technology 2017-04-04 21:35:45 -04:00
Eugen
1bb3d8d3f5 Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
2017-04-05 03:24:08 +02:00
Eugen
cb1617245b Merge branch 'master' into patch-1 2017-04-05 03:20:37 +02:00
Eugen
49cd7f7fc4 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
4390ae7bf9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen
7603a1d5d2 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
0662ab35eb Merge pull request #842 from Angristan/patch-2
Missing quotes
2017-04-05 03:08:24 +02:00
Eugen
9c47a07dfa Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
3340074137 Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
2017-04-05 03:07:46 +02:00
Eugen
b3523a6a8d Merge pull request #854 from Angristan/patch-3
Fix crontab edit
2017-04-05 03:07:28 +02:00
Eugen
ae1b33d594 Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
2017-04-05 03:01:43 +02:00
Eugen
dd839491b6 Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Ash Furrow
bd371b6adb Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen
a5f1a6bf01 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Jason Snell
1771eea458 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Ash Furrow
5e8e8ba01d Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Udo Kramer
cfa339d3ff Update Production-guide.md 2017-04-04 23:45:29 +02:00
Nope Nope
583208f5ae typo in admin doc
s/rails/rake/
2017-04-04 20:45:32 +02:00
Angristan
1447ba504b Add file package
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
2017-04-04 19:23:53 +02:00
Pierre Ozoux
ecbda73b27 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz
3187e1b398 Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
8db8132504 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00