4209 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Eugen Rochko	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
Eugen Rochko	29ffe1cad3	Make sure Rabl is using Oj	2017-04-05 19:29:30 +02:00
Ben Field	8fa8004a2b	Update List-of-Mastodon-instances.md	2017-04-05 18:20:08 +01:00
Christopher Gilbert	e5566ac6a6	Add Rich.GOP	2017-04-05 13:05:27 -04:00
Eugen	c9ebd5d19f	Fix wrong variable used in publish channel	2017-04-05 18:58:32 +02:00
foxiehkins	ac1989d2c0	Update description on good-dragon.com	2017-04-05 17:49:04 +01:00
Eugen	1b8c244dff	Add proper message to PushUpdateWorker, use redis directly	2017-04-05 18:48:41 +02:00
foxiehkins	32d4b51939	Add good-dragon.com	2017-04-05 17:47:52 +01:00
Eugen	3d8b80e1cc	Merge branch 'master' into broadcast-to-worker	2017-04-05 18:44:33 +02:00
Thomas Alberola	b38bd58921	Adding masto.raildecake.fr, french instance 🌻🐘	2017-04-05 18:15:39 +02:00
tom	8989569dd4	Update components.scss ... Use nicer scrollbars in MS edge	2017-04-05 12:10:25 -04:00
ZiiX	96812a6c79	added instance	2017-04-05 09:05:57 -07:00
Amanda Visconti	a31f5765af	Added digitalhumanities.club instance	2017-04-05 12:04:21 -04:00
Ben Field	41a78be25e	Update Production-guide.md ... Corrected spelling error for "install"	2017-04-05 16:56:51 +01:00
Toby Deshane	9cf0b5b255	Add social.bytestemplar.com to instances list	2017-04-05 11:49:36 -04:00
Jonathan Hurter	b8218ca482	Make scalingo doc clearer	2017-04-05 17:48:55 +02:00
Jonathan Hurter	4335dffe35	Fix wrong url in scalingo.json	2017-04-05 17:28:11 +02:00
Kody	4de3182dc8	Added im-in.space	2017-04-05 17:00:03 +02:00
shel	ee758551d1	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	b142a2ebf5	Merge pull request #947 from johnsudaar/feature/scalingo_one_click ... Add Scalingo deployment support	2017-04-05 16:50:46 +02:00
Technowix	9a534d1df6	Add niu.moe, cuz it's kawaii	2017-04-05 16:18:52 +02:00
VirtuBox	28fb01c71a	Update List-of-Mastodon-instances.md	2017-04-05 16:02:47 +02:00
Jonathan Hurter	d6bab0c71c	Add doc	2017-04-05 16:00:48 +02:00
Jonathan Hurter	5e7ec0fe57	Use root repository url	2017-04-05 15:52:06 +02:00
Jonathan Hurter	152a1e578c	Add Scalingo one click on readme	2017-04-05 15:33:19 +02:00
Eugen	a371a9e002	Merge pull request #940 from fahy/patch-1 ... Adding mastodon.irish	2017-04-05 15:24:52 +02:00
Eugen	be807ff7bd	Merge pull request #930 from nicobz25/patch-1 ... Update List-of-Mastodon-instances.md	2017-04-05 15:24:40 +02:00
Eugen	68e0421577	Merge pull request #939 from JantsoP/master ... More translation updates	2017-04-05 15:24:24 +02:00
Padraig Fahy	cbcfd92a14	Adding mastodon.irish	2017-04-05 14:00:35 +01:00
Eugen	b45b4865a7	Merge pull request #938 from wxcafe/patch-3 ... Updates description for `social.wxcafe.net`	2017-04-05 14:57:38 +02:00
Eugen	188172c401	Merge pull request #931 from farlistener/patch-3 ... Typography on partY	2017-04-05 14:57:14 +02:00
Eugen	7c4dde56a3	Merge pull request #936 from Angristan/patch-7 ... Add git and curl as dependencies	2017-04-05 14:57:01 +02:00
Jantso Porali	837030db98	updated blocking translation	2017-04-05 14:53:35 +02:00
Jantso Porali	deb001bba8	updated two-way auth and preferences translation	2017-04-05 14:49:29 +02:00
Jantso Porali	d3bf0307db	updated translation for about page	2017-04-05 14:47:42 +02:00
Jonathan Hurter	bf523fcd16	Add node_modules and .cache to slugignore	2017-04-05 14:28:14 +02:00
Eugen Rochko	220bc48e8e	Only render public payload once in FanOutOnWrite	2017-04-05 14:26:17 +02:00
wxcafé	259e626165	Update List-of-Mastodon-instances.md	2017-04-05 14:21:45 +02:00
Angristan	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
Jonathan Hurter	79765d61f5	Install nodejs before ruby	2017-04-05 13:53:30 +02:00
nicobz25	6201fba2d3	Merge branch 'master' into patch-1	2017-04-05 13:48:31 +02:00
Jonathan Hurter	0a984e90d3	Add scalingo support	2017-04-05 13:45:03 +02:00
Eugen Rochko	cfe91ac984	Add index on mentions status_id	2017-04-05 13:32:57 +02:00
Eugen Rochko	8530f9413b	Replace ActionCable broadcast call with simple redis publish	2017-04-05 13:28:46 +02:00
Cédric Levieux	85c768bf16	Typography on partY	2017-04-05 13:19:34 +02:00
nicobz25	9572282a55	Update List-of-Mastodon-instances.md ... Add our mastodon instance :) Thanks !	2017-04-05 13:13:09 +02:00
Eugen	f8a5ff95ec	Merge pull request #923 from jguerder/patch-1 ... Added mastodon.cx	2017-04-05 12:33:02 +02:00
Eugen	af0decf597	Merge pull request #925 from Angristan/patch-6 ... Add mstdn.io	2017-04-05 12:26:17 +02:00
Eugen	ba5e23ecce	Merge pull request #926 from farlistener/patch-2 ... Add mastodon.partipirate.org	2017-04-05 12:26:02 +02:00
Eugen	a107de07c9	Merge pull request #922 from Angristan/patch-5 ... ECDH only	2017-04-05 12:18:57 +02:00