bf7cefa516
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
d13d169922
Merge branch 'krainboltgreene-broadcast-to-worker'
2017-04-05 19:46:28 +02:00
5b95be1c42
Replace calls to FeedManager#inline_render and #broadcast
2017-04-05 19:45:18 +02:00
d755ce96da
Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker
2017-04-05 19:29:46 +02:00
29ffe1cad3
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
c9ebd5d19f
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
1b8c244dff
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
3d8b80e1cc
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
b142a2ebf5
Merge pull request #947 from johnsudaar/feature/scalingo_one_click
...
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
d6bab0c71c
Add doc
2017-04-05 16:00:48 +02:00
5e7ec0fe57
Use root repository url
2017-04-05 15:52:06 +02:00
152a1e578c
Add Scalingo one click on readme
2017-04-05 15:33:19 +02:00
a371a9e002
Merge pull request #940 from fahy/patch-1
...
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
be807ff7bd
Merge pull request #930 from nicobz25/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
68e0421577
Merge pull request #939 from JantsoP/master
...
More translation updates
2017-04-05 15:24:24 +02:00
cbcfd92a14
Adding mastodon.irish
2017-04-05 14:00:35 +01:00
b45b4865a7
Merge pull request #938 from wxcafe/patch-3
...
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
188172c401
Merge pull request #931 from farlistener/patch-3
...
Typography on partY
2017-04-05 14:57:14 +02:00
7c4dde56a3
Merge pull request #936 from Angristan/patch-7
...
Add git and curl as dependencies
2017-04-05 14:57:01 +02:00
837030db98
updated blocking translation
2017-04-05 14:53:35 +02:00
deb001bba8
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
d3bf0307db
updated translation for about page
2017-04-05 14:47:42 +02:00
bf523fcd16
Add node_modules and .cache to slugignore
2017-04-05 14:28:14 +02:00
220bc48e8e
Only render public payload once in FanOutOnWrite
2017-04-05 14:26:17 +02:00
259e626165
Update List-of-Mastodon-instances.md
2017-04-05 14:21:45 +02:00
5ed2de6be2
Add git and curl as dependencies
...
In some VPS templates, they are not installed by default.
2017-04-05 14:11:08 +02:00
79765d61f5
Install nodejs before ruby
2017-04-05 13:53:30 +02:00
6201fba2d3
Merge branch 'master' into patch-1
2017-04-05 13:48:31 +02:00
0a984e90d3
Add scalingo support
2017-04-05 13:45:03 +02:00
cfe91ac984
Add index on mentions status_id
2017-04-05 13:32:57 +02:00
8530f9413b
Replace ActionCable broadcast call with simple redis publish
2017-04-05 13:28:46 +02:00
85c768bf16
Typography on partY
2017-04-05 13:19:34 +02:00
9572282a55
Update List-of-Mastodon-instances.md
...
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
f8a5ff95ec
Merge pull request #923 from jguerder/patch-1
...
Added mastodon.cx
2017-04-05 12:33:02 +02:00
af0decf597
Merge pull request #925 from Angristan/patch-6
...
Add mstdn.io
2017-04-05 12:26:17 +02:00
ba5e23ecce
Merge pull request #926 from farlistener/patch-2
...
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00
a107de07c9
Merge pull request #922 from Angristan/patch-5
...
ECDH only
2017-04-05 12:18:57 +02:00
bdf3ac95b8
Add mastodon.partipirate.org
2017-04-05 11:24:21 +02:00
fa6f7c8898
Add mstdn.io
2017-04-05 11:16:56 +02:00
5963fce131
Added mastodon.cx
2017-04-05 10:52:56 +02:00
5dbcd92193
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
792389da38
Merge pull request #909 from scriptjunkie/master
...
Add https://securitymastod.one/
2017-04-05 10:29:58 +02:00
8b8839978a
Merge branch 'master' into master
2017-04-05 10:29:52 +02:00
78cf0fe1c7
Merge pull request #901 from ashfurrow/patch-3
...
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
18d0e817dd
Merge pull request #911 from IMcD23/patch-1
...
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
1904a1aa14
Merge pull request #919 from JantsoP/master
...
More updates to Finnish language
2017-04-05 10:27:12 +02:00
b5f8273312
Merge pull request #902 from asm/ssl_best_practices
...
SSL best practices for nginx
2017-04-05 10:26:32 +02:00
3504da5cac
Fix API method URL typo
2017-04-05 10:25:05 +02:00
8814f90eb5
Merge pull request #903 from yiskah/patch-6
...
Corrected misinformation regarding Direct Posts
2017-04-05 10:24:25 +02:00
6b566c6b88
Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
...
ApplicationWorker for shared worker behavior
2017-04-05 10:23:52 +02:00
André Lewin
Eugen Rochko
Jonathan Hurter
Padraig Fahy
Jantso Porali
wxcafé
Angristan
nicobz25
Cédric Levieux
Jordan Guerder