mastodon

vbatts/mastodon

Fork 0

Commit graph

4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception v1.1 Eugen 2017-04-07 13:08:51 +02:00
10459241a8 Merge pull request #1145 from tootsuite/feature-customized-default-locale Eugen 2017-04-07 13:08:27 +02:00
c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception Eugen 2017-04-07 13:07:36 +02:00
0adee18d73 Merge branch 'master' into feature-customized-default-locale Eugen 2017-04-07 13:07:03 +02:00
8a6d8de60a Fix nil#object_type error Eugen Rochko 2017-04-07 13:05:34 +02:00
786e6f94b9 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +02:00
0c4e9fdda0 Merge branch 'master' into patch-4 Erwan Leboucher 2017-04-07 12:43:56 +02:00
e3a3422a65 Allow setting of default language through config Eugen Rochko 2017-04-07 12:40:26 +02:00
624a9a7136 Re-add forgotten <author> element on standalone <entry> Eugen Rochko 2017-04-07 12:21:00 +02:00
1c351709bc Force UTF8 encoding on generated XML (#1140) Eugen 2017-04-07 11:09:14 +02:00
8e7d0bda40 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +03:00
6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) Eugen 2017-04-07 05:56:56 +02:00
5d43a9cae2 Email service options :P Jason Rhodes 2017-04-06 22:48:17 -04:00
8a4ff30ceb updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -07:00
56f4a94e7b Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +02:00
31597fd377 Low-hanging fruit of query optimization, these indices were missing Eugen Rochko 2017-04-07 00:04:09 +02:00
4b08b7c502 Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +02:00
8cb7d157bd Merge pull request #1100 from mjankowski/mj-reduce-image-size Eugen 2017-04-06 22:59:48 +02:00
acf10a2c87 Merge pull request #1103 from alimony/vagrant-tweaks-01 Eugen 2017-04-06 22:58:44 +02:00
7596de1aec Add a couple of network performance tweaks to Vagrantfile. Markus Amalthea Magnuson 2017-04-06 22:34:59 +02:00
97ae53daa8 Reduce size of background-photo.jpeg Matt Jankowski 2017-04-06 16:24:57 -04:00
cd77c75d6c Merge pull request #1088 from Wonderfall/master Eugen 2017-04-06 21:35:10 +02:00
cfbd90cf44 Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -07:00
ed2bfdee67

add Docker microbadger to README.md Wonderfall 2017-04-06 20:59:20 +02:00
a3318814e1

add metadata to Dockerfile Wonderfall 2017-04-06 20:57:16 +02:00
acf6436a99 Add manx.social instance isati 2017-04-06 19:31:25 +01:00
a0f1f9c664 Update List-of-Mastodon-instances.md Erwan Leboucher 2017-04-06 20:18:56 +02:00
f0d1107c53 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:33:36 +02:00
02c1ad5347 Update List-of-Mastodon-instances.md kadiix 2017-04-06 19:33:17 +02:00
fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile Eugen 2017-04-06 19:32:50 +02:00
a736b28646 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:32:31 +02:00
c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-06 19:32:12 +02:00
0d5d3c7abe Add an instance. kadiix 2017-04-06 19:15:57 +02:00
c441208e29 Merge branch 'master' into patch-1 VirtuBox 2017-04-06 19:11:39 +02:00
5e63828917 Merge pull request #1048 from ashfurrow/slugignore Eugen 2017-04-06 19:09:45 +02:00
ea86f4db15 Merge pull request #1070 from alexgleason/patch-4 Eugen 2017-04-06 19:02:14 +02:00
a3d204e982 Linux users must enable NFS for Vagrant Alex Gleason 2017-04-06 12:16:39 -04:00
07495cc13f Update List-of-Mastodon-instances.md awea 2017-04-06 18:07:15 +02:00
6a88151eda Add meow.social Julien 2017-04-06 14:51:42 +02:00
30619a6716 add my instance Lukas Fülling 2017-04-06 14:22:01 +02:00
a2adf84858

Updates slugignore. Ash Furrow 2017-04-06 07:53:48 -04:00
eadac4e7f4 Added an instance to the list Ray Alez 2017-04-06 03:12:34 -07:00
0209b7d1b5 Update List-of-Mastodon-instances.md Yann GUERN 2017-04-06 11:07:33 +02:00
a2637c1720 Optimize Dockerfile Ryan Wade 2017-04-06 15:41:00 +08:00
c62696bc46 Update List-of-Mastodon-instances.md Markus R 2017-04-06 08:52:15 +02:00
83530f0eef

Add mastodon.elao.com instance Guewen FAIVRE 2017-04-06 08:46:16 +02:00
73b8e67f4b Add infinimatix.net to instance list Derek Lewis 2017-04-06 01:11:16 -04:00
51d7caaf19 Fix wrong pubsub channel on public timelines Eugen Rochko 2017-04-06 04:03:23 +02:00
b5d87500d2 Add Northeastern University Mastodon Jack Michaud 2017-04-05 20:58:21 -04:00
a9c0062e80 Merge pull request #1013 from blackle/master Eugen 2017-04-06 02:35:34 +02:00
dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService, slightly optimized FanOutOnWriteService again Eugen Rochko 2017-04-06 02:26:59 +02:00
540d6efe88 Catch more errors in process_follows so it doesn't fail blackle 2017-04-05 20:04:13 -04:00
d025c5e593 Added off-the-clock.us to the list of instances Nick Gerakines 2017-04-05 19:19:44 -04:00
7aede8e720 Description in instance list for mastodon.ninetailed.uk Ninetailed 2017-04-05 22:35:35 +01:00
dea6e47de0 Merge pull request #993 from foozmeat/patch-1 Eugen 2017-04-05 23:26:44 +02:00
5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job Eugen Rochko 2017-04-05 21:41:50 +02:00
c19e0f1212 Use NFS for the shared folder because it dramatically decreases latency for git operations. James Moore 2017-04-05 11:53:39 -07:00
bafbf63fcc Merge pull request #958 from yiskah/patch-1 Eugen 2017-04-05 20:48:19 +02:00
eb98c99924 Add mastodon.nuzgo.net Thibaut (Eychics) 2017-04-05 20:45:23 +02:00
6b41fb2e6f Update List-of-Mastodon-instances.md ava 2017-04-05 21:44:13 +03:00
bf7cefa516 Merge branch 'master' into master André Lewin 2017-04-05 20:28:58 +02:00
65b3a2a5a6 Adds mtndevelopment Brad Janke 2017-04-05 13:14:27 -05:00
d13d169922 Merge branch 'krainboltgreene-broadcast-to-worker' Eugen Rochko 2017-04-05 19:46:28 +02:00
5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast Eugen Rochko 2017-04-05 19:45:18 +02:00
d755ce96da Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker Eugen Rochko 2017-04-05 19:29:46 +02:00
29ffe1cad3 Make sure Rabl is using Oj Eugen Rochko 2017-04-05 18:51:15 +02:00
8fa8004a2b Update List-of-Mastodon-instances.md Ben Field 2017-04-05 18:20:08 +01:00
e5566ac6a6 Add Rich.GOP Christopher Gilbert 2017-04-05 13:05:27 -04:00
c9ebd5d19f Fix wrong variable used in publish channel Eugen 2017-04-05 18:58:32 +02:00
ac1989d2c0 Update description on good-dragon.com foxiehkins 2017-04-05 17:49:04 +01:00
1b8c244dff Add proper message to PushUpdateWorker, use redis directly Eugen 2017-04-05 18:48:41 +02:00
32d4b51939 Add good-dragon.com foxiehkins 2017-04-05 17:47:52 +01:00
3d8b80e1cc Merge branch 'master' into broadcast-to-worker Eugen 2017-04-05 18:44:33 +02:00
b38bd58921 Adding masto.raildecake.fr, french instance 🌻🐘 Thomas Alberola 2017-04-05 18:15:39 +02:00
8989569dd4 Update components.scss tom 2017-04-05 12:10:25 -04:00
96812a6c79 added instance ZiiX 2017-04-05 09:05:57 -07:00
a31f5765af Added digitalhumanities.club instance Amanda Visconti 2017-04-05 12:04:21 -04:00
41a78be25e Update Production-guide.md Ben Field 2017-04-05 16:56:51 +01:00
9cf0b5b255 Add social.bytestemplar.com to instances list Toby Deshane 2017-04-05 11:49:36 -04:00
b8218ca482 Make scalingo doc clearer Jonathan Hurter 2017-04-05 17:48:55 +02:00
4335dffe35 Fix wrong url in scalingo.json Jonathan Hurter 2017-04-05 17:28:11 +02:00
4de3182dc8 Added im-in.space Kody 2017-04-05 17:00:03 +02:00
ee758551d1 Correct innacurate info and other fixes shel 2017-04-05 10:58:41 -04:00
b142a2ebf5 Merge pull request #947 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-05 16:50:46 +02:00
9a534d1df6 Add niu.moe, cuz it's kawaii Technowix 2017-04-05 16:18:52 +02:00
28fb01c71a Update List-of-Mastodon-instances.md VirtuBox 2017-04-05 16:02:47 +02:00
d6bab0c71c Add doc Jonathan Hurter 2017-04-05 16:00:48 +02:00
5e7ec0fe57 Use root repository url Jonathan Hurter 2017-04-05 15:52:06 +02:00
152a1e578c Add Scalingo one click on readme Jonathan Hurter 2017-04-05 15:26:36 +02:00
a371a9e002 Merge pull request #940 from fahy/patch-1 Eugen 2017-04-05 15:24:52 +02:00
be807ff7bd Merge pull request #930 from nicobz25/patch-1 Eugen 2017-04-05 15:24:40 +02:00
68e0421577 Merge pull request #939 from JantsoP/master Eugen 2017-04-05 15:24:24 +02:00
cbcfd92a14 Adding mastodon.irish Padraig Fahy 2017-04-05 14:00:35 +01:00
b45b4865a7 Merge pull request #938 from wxcafe/patch-3 Eugen 2017-04-05 14:57:38 +02:00
188172c401 Merge pull request #931 from farlistener/patch-3 Eugen 2017-04-05 14:57:14 +02:00
7c4dde56a3 Merge pull request #936 from Angristan/patch-7 Eugen 2017-04-05 14:57:01 +02:00
837030db98 updated blocking translation Jantso Porali 2017-04-05 14:53:35 +02:00
deb001bba8 updated two-way auth and preferences translation Jantso Porali 2017-04-05 14:49:29 +02:00
d3bf0307db updated translation for about page Jantso Porali 2017-04-05 14:47:42 +02:00
bf523fcd16 Add node_modules and .cache to slugignore Jonathan Hurter 2017-04-05 14:13:34 +02:00