Commit Graph

2102 Commits

Author SHA1 Message Date
Eugen
cd77c75d6c Merge pull request #1088 from Wonderfall/master
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
Tristan Mahé
cfbd90cf44 Added pericles.world in the list of instances 2017-04-06 12:05:37 -07:00
Wonderfall
ed2bfdee67
add Docker microbadger to README.md 2017-04-06 20:59:20 +02:00
Wonderfall
a3318814e1
add metadata to Dockerfile 2017-04-06 20:57:16 +02:00
isati
acf6436a99 Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher
a0f1f9c664 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix
f0d1107c53 Merge branch 'master' into patch-1 2017-04-06 19:33:36 +02:00
kadiix
02c1ad5347 Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00
Eugen
fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
kadiix
a736b28646 Merge branch 'master' into patch-1 2017-04-06 19:32:31 +02:00
Eugen
c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +02:00
kadiix
0d5d3c7abe Add an instance. 2017-04-06 19:15:57 +02:00
VirtuBox
c441208e29 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
Eugen
5e63828917 Merge pull request #1048 from ashfurrow/slugignore
Updates slugignore
2017-04-06 19:09:45 +02:00
Eugen
ea86f4db15 Merge pull request #1070 from alexgleason/patch-4
Linux users must enable NFS for Vagrant
2017-04-06 19:02:14 +02:00
Alex Gleason
a3d204e982 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
awea
07495cc13f Update List-of-Mastodon-instances.md 2017-04-06 18:07:15 +02:00
Julien
6a88151eda Add meow.social 2017-04-06 14:51:42 +02:00
Lukas Fülling
30619a6716 add my instance 2017-04-06 14:22:01 +02:00
Ash Furrow
a2adf84858
Updates slugignore. 2017-04-06 07:53:48 -04:00
Ray Alez
eadac4e7f4 Added an instance to the list
Just launched https://hackertribe.io/, added it to the list.
2017-04-06 03:12:34 -07:00
Yann GUERN
0209b7d1b5 Update List-of-Mastodon-instances.md
Add mastodon.land instance
2017-04-06 11:07:33 +02:00
Ryan Wade
a2637c1720 Optimize Dockerfile
Optimize Dockerfile, reduce build time.
2017-04-06 15:42:16 +08:00
Markus R
c62696bc46 Update List-of-Mastodon-instances.md 2017-04-06 08:52:15 +02:00
Guewen FAIVRE
83530f0eef
Add mastodon.elao.com instance 2017-04-06 08:46:16 +02:00
Derek Lewis
73b8e67f4b Add infinimatix.net to instance list 2017-04-06 01:15:16 -04:00
Eugen Rochko
51d7caaf19 Fix wrong pubsub channel on public timelines 2017-04-06 04:03:23 +02:00
Jack Michaud
b5d87500d2 Add Northeastern University Mastodon 2017-04-05 20:58:21 -04:00
Eugen
a9c0062e80 Merge pull request #1013 from blackle/master
Catch more errors in process_follows so it doesn't fail
2017-04-06 02:35:34 +02:00
Eugen Rochko
dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00
blackle
540d6efe88 Catch more errors in process_follows so it doesn't fail 2017-04-05 20:04:13 -04:00
Nick Gerakines
d025c5e593 Added off-the-clock.us to the list of instances 2017-04-05 19:19:44 -04:00
Ninetailed
7aede8e720 Description in instance list for mastodon.ninetailed.uk 2017-04-05 22:35:35 +01:00
Eugen
dea6e47de0 Merge pull request #993 from foozmeat/patch-1
Use NFS for the shared folder because it dramatically decreases latency for git operations.
2017-04-05 23:26:44 +02:00
Eugen Rochko
5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job 2017-04-05 21:43:10 +02:00
James Moore
c19e0f1212 Use NFS for the shared folder because it dramatically decreases latency for git operations. 2017-04-05 11:53:39 -07:00
Eugen
bafbf63fcc Merge pull request #958 from yiskah/patch-1
Correct innacurate info and other fixes
2017-04-05 20:48:19 +02:00
Thibaut (Eychics)
eb98c99924 Add mastodon.nuzgo.net 2017-04-05 20:45:23 +02:00
ava
6b41fb2e6f Update List-of-Mastodon-instances.md 2017-04-05 21:44:13 +03:00
André Lewin
bf7cefa516 Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
Brad Janke
65b3a2a5a6 Adds mtndevelopment 2017-04-05 13:14:27 -05:00
Eugen Rochko
d13d169922 Merge branch 'krainboltgreene-broadcast-to-worker' 2017-04-05 19:46:28 +02:00
Eugen Rochko
5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast 2017-04-05 19:45:18 +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
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