Commit Graph

1777 Commits (41f34e7412490c384d36ea211f0cda82d37cc68e)

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
Jonathan Hurter 18caabad8a Use root repository url 2017-04-05 15:52:06 +02:00
Jonathan Hurter 3c7acd0ab6 Add Scalingo one click on readme 2017-04-05 15:33:19 +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
Eugen 10fa3627ea Merge pull request #939 from JantsoP/master
More translation updates
2017-04-05 15:24:24 +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
Eugen 9c3c6f6e51 Merge pull request #936 from Angristan/patch-7
Add git and curl as dependencies
2017-04-05 14:57:01 +02:00
Jantso Porali 5c414eeb45 updated blocking translation 2017-04-05 14:53:35 +02:00
Jantso Porali 16d14e854b updated two-way auth and preferences translation 2017-04-05 14:49:29 +02:00
Jantso Porali d49612327a updated translation for about page 2017-04-05 14:47:42 +02:00
Jonathan Hurter ffa888d59f Add node_modules and .cache to slugignore 2017-04-05 14:28:14 +02:00
Eugen Rochko 8f38353c4d Only render public payload once in FanOutOnWrite 2017-04-05 14:26:17 +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
Jonathan Hurter f3cc1e4416 Install nodejs before ruby 2017-04-05 13:53:30 +02:00
nicobz25 1e9b047d16 Merge branch 'master' into patch-1 2017-04-05 13:48:31 +02:00
Jonathan Hurter 05eba582ef Add scalingo support 2017-04-05 13:45:03 +02:00
Eugen Rochko 6687c4a114 Add index on mentions status_id 2017-04-05 13:32:57 +02:00
Eugen Rochko 3cc7378924 Replace ActionCable broadcast call with simple redis publish 2017-04-05 13:28:46 +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
Eugen dde3a33e32 Merge pull request #922 from Angristan/patch-5
ECDH only
2017-04-05 12:18:57 +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 10bd0e63d2 Merge pull request #909 from scriptjunkie/master
Add https://securitymastod.one/
2017-04-05 10:29:58 +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 cae7d221c7 Merge pull request #919 from JantsoP/master
More updates to Finnish language
2017-04-05 10:27:12 +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
Eugen 35eeb13a6b Merge pull request #903 from yiskah/patch-6
Corrected misinformation regarding Direct Posts
2017-04-05 10:24:25 +02:00
Eugen 39e5ecb61d Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
ApplicationWorker for shared worker behavior
2017-04-05 10:23:52 +02:00
Eugen 4a2b06ae13 Merge pull request #910 from krainboltgreene/master
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
2017-04-05 10:23:32 +02:00
Eugen 80ef37d13e Merge pull request #914 from bradurani/bu/query_cleanup
Eliminate unnecessary queries and query clauses with none and all
2017-04-05 10:23:10 +02:00
JantsoP c0295924bc Merge branch 'master' into master 2017-04-05 10:07:17 +02:00
JantsoP c33a8ce307 updated reblog to boost translation
Since it is that :D
2017-04-05 09:57:25 +02:00
JantsoP 6a33b51fd2 updated translation
Updated some translations after seeing them in service. Should be better now
2017-04-05 09:56:10 +02:00
JantsoP 7ea7713997 udpdated display_name translation 2017-04-05 09:52:31 +02:00
JantsoP b97a8236fb updated reblog translation 2017-04-05 09:51:35 +02:00