Commit graph

39666 commits

Author SHA1 Message Date
André Lewin
bf7cefa516 Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
Brad Janke
9999d134dd Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Brad Janke
65b3a2a5a6 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
d13d169922 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
5b95be1c42 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
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
06e3d9bdd8 Make sure Rabl is using Oj 2017-04-05 19:29:30 +02:00
Eugen Rochko
29ffe1cad3 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
Ben Field
8fa8004a2b 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
Christopher Gilbert
e5566ac6a6 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
Eugen
c9ebd5d19f 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
foxiehkins
ac1989d2c0 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
Eugen
1b8c244dff 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
foxiehkins
32d4b51939 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
Eugen
3d8b80e1cc 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
Thomas Alberola
b38bd58921 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
tom
8989569dd4 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
ZiiX
96812a6c79 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
Amanda Visconti
a31f5765af 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
Ben Field
41a78be25e 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
Toby Deshane
9cf0b5b255 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
b8218ca482 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
Jonathan Hurter
4335dffe35 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
Kody
4de3182dc8 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
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
b89f37e445 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02: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
d5f05d07d6 Add niu.moe, cuz it's kawaii 2017-04-05 16:18:52 +02:00
Technowix
9a534d1df6 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