Commit graph

2062 commits

Author SHA1 Message Date
Brad Janke
9999d134dd Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Eugen Rochko
c9116f673f Merge branch 'krainboltgreene-broadcast-to-worker' 2017-04-05 19:46:28 +02:00
Eugen Rochko
5189ce9cd1 Replace calls to FeedManager#inline_render and #broadcast 2017-04-05 19:45:18 +02:00
Eugen Rochko
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
Eugen Rochko
06e3d9bdd8 Make sure Rabl is using Oj 2017-04-05 19:29:30 +02:00
Ben Field
5455080fae Update List-of-Mastodon-instances.md 2017-04-05 18:20:08 +01:00
Christopher Gilbert
d67299887a Add Rich.GOP 2017-04-05 13:05:27 -04:00
Eugen
54329947ab Fix wrong variable used in publish channel 2017-04-05 18:58:32 +02:00
foxiehkins
8abe6c0a32 Update description on good-dragon.com 2017-04-05 17:49:04 +01:00
Eugen
b9ddfff8f6 Add proper message to PushUpdateWorker, use redis directly 2017-04-05 18:48:41 +02:00
foxiehkins
e22f32e058 Add good-dragon.com 2017-04-05 17:47:52 +01:00
Eugen
d67e1fe44d Merge branch 'master' into broadcast-to-worker 2017-04-05 18:44:33 +02:00
Thomas Alberola
84af4bbe59 Adding masto.raildecake.fr, french instance 🌻🐘 2017-04-05 18:15:39 +02:00
tom
ea10ddedaa Update components.scss
Use nicer scrollbars in MS edge
2017-04-05 12:10:25 -04:00
ZiiX
9e99e00b5a added instance 2017-04-05 09:05:57 -07:00
Amanda Visconti
47f8766d70 Added digitalhumanities.club instance 2017-04-05 12:04:21 -04:00
Ben Field
621b70f085 Update Production-guide.md
Corrected spelling error for "install"
2017-04-05 16:56:51 +01:00
Toby Deshane
59e1298b80 Add social.bytestemplar.com to instances list 2017-04-05 11:49:36 -04:00
Jonathan Hurter
f210b2b7ef Make scalingo doc clearer 2017-04-05 17:48:55 +02:00
Jonathan Hurter
2ecc791d9a Fix wrong url in scalingo.json 2017-04-05 17:28:11 +02:00
Kody
41f34e7412 Added im-in.space 2017-04-05 17:00:03 +02:00
shel
fd0096f899 Correct innacurate info and other fixes
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
2017-04-05 10:58:41 -04: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
Technowix
d5f05d07d6 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
VirtuBox
8a360d4292 Update List-of-Mastodon-instances.md 2017-04-05 16:02:47 +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