21966f0af3
Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker
2017-04-05 19:29:46 +02:00
06e3d9bdd8
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
54329947ab
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
b9ddfff8f6
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
d67e1fe44d
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
b89f37e445
Merge pull request #947 from johnsudaar/feature/scalingo_one_click
...
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
8752dc9186
Add doc
2017-04-05 16:00:48 +02:00
18caabad8a
Use root repository url
2017-04-05 15:52:06 +02:00
3c7acd0ab6
Add Scalingo one click on readme
2017-04-05 15:33:19 +02:00
437bc1880b
Merge pull request #940 from fahy/patch-1
...
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
676763dbc8
Merge pull request #930 from nicobz25/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
10fa3627ea
Merge pull request #939 from JantsoP/master
...
More translation updates
2017-04-05 15:24:24 +02:00
9efa03d2be
Adding mastodon.irish
2017-04-05 14:00:35 +01:00
3a39a67901
Merge pull request #938 from wxcafe/patch-3
...
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
db522ed61a
Merge pull request #931 from farlistener/patch-3
...
Typography on partY
2017-04-05 14:57:14 +02:00
9c3c6f6e51
Merge pull request #936 from Angristan/patch-7
...
Add git and curl as dependencies
2017-04-05 14:57:01 +02:00
5c414eeb45
updated blocking translation
2017-04-05 14:53:35 +02:00
16d14e854b
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
d49612327a
updated translation for about page
2017-04-05 14:47:42 +02:00
ffa888d59f
Add node_modules and .cache to slugignore
2017-04-05 14:28:14 +02:00
8f38353c4d
Only render public payload once in FanOutOnWrite
2017-04-05 14:26:17 +02:00
37bd8d45ed
Update List-of-Mastodon-instances.md
2017-04-05 14:21:45 +02:00
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
f3cc1e4416
Install nodejs before ruby
2017-04-05 13:53:30 +02:00
1e9b047d16
Merge branch 'master' into patch-1
2017-04-05 13:48:31 +02:00
05eba582ef
Add scalingo support
2017-04-05 13:45:03 +02:00
6687c4a114
Add index on mentions status_id
2017-04-05 13:32:57 +02:00
3cc7378924
Replace ActionCable broadcast call with simple redis publish
2017-04-05 13:28:46 +02:00
06d3e7dbba
Typography on partY
2017-04-05 13:19:34 +02:00
6ea25d695a
Update List-of-Mastodon-instances.md
...
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
7395c62367
Merge pull request #923 from jguerder/patch-1
...
Added mastodon.cx
2017-04-05 12:33:02 +02:00
dd4cec6699
Merge pull request #925 from Angristan/patch-6
...
Add mstdn.io
2017-04-05 12:26:17 +02:00
786dabefed
Merge pull request #926 from farlistener/patch-2
...
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00
dde3a33e32
Merge pull request #922 from Angristan/patch-5
...
ECDH only
2017-04-05 12:18:57 +02:00
9e06446d65
Add mastodon.partipirate.org
2017-04-05 11:24:21 +02:00
17fb783672
Add mstdn.io
2017-04-05 11:16:56 +02:00
3a98afd3e9
Added mastodon.cx
2017-04-05 10:52:56 +02:00
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
10bd0e63d2
Merge pull request #909 from scriptjunkie/master
...
Add https://securitymastod.one/
2017-04-05 10:29:58 +02:00
3975f92b8d
Merge branch 'master' into master
2017-04-05 10:29:52 +02:00
f8fd1e8a29
Merge pull request #901 from ashfurrow/patch-3
...
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
4d46908556
Merge pull request #911 from IMcD23/patch-1
...
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00
cae7d221c7
Merge pull request #919 from JantsoP/master
...
More updates to Finnish language
2017-04-05 10:27:12 +02:00
b41e48ffe4
Merge pull request #902 from asm/ssl_best_practices
...
SSL best practices for nginx
2017-04-05 10:26:32 +02:00
1f7dccf535
Fix API method URL typo
2017-04-05 10:25:05 +02:00
35eeb13a6b
Merge pull request #903 from yiskah/patch-6
...
Corrected misinformation regarding Direct Posts
2017-04-05 10:24:25 +02:00
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
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
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
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
Eugen Rochko