Commit graph

2322 commits

Author SHA1 Message Date
Eugen
b686d76a15 Merge pull request #1145 from tootsuite/feature-customized-default-locale
Allow setting of default language through config
2017-04-07 13:08:27 +02:00
Eugen
7215446774 Merge branch 'master' into fix-object-type-nil-exception 2017-04-07 13:07:36 +02:00
Eugen
ef7240169a Merge branch 'master' into feature-customized-default-locale 2017-04-07 13:07:03 +02:00
Eugen Rochko
eaa0b8e669 Fix nil#object_type error 2017-04-07 13:05:34 +02:00
Jantso Porali
fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Erwan Leboucher
07d1559425 Merge branch 'master' into patch-4 2017-04-07 12:43:56 +02:00
Eugen Rochko
9bb84337a7 Allow setting of default language through config
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
Eugen Rochko
a1c63cb01d Re-add forgotten <author> element on standalone <entry> 2017-04-07 12:21:00 +02:00
Eugen
1781fcaea4 Force UTF8 encoding on generated XML (#1140) 2017-04-07 11:09:14 +02:00
Sergei Č
44ded06f3b Update List-of-Mastodon-instances.md 2017-04-07 11:54:41 +03:00
Eugen
24c77e57b2 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder

StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker

PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.

All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri

* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07 05:56:56 +02:00
Jason Rhodes
af34bcad02 Email service options :P
Small addition in case people want email service options, sparkpost.com gives you 100k/mo free
2017-04-06 22:48:17 -04:00
Tristan Mahé
a80680cf3f updated instance hostname 2017-04-06 17:18:40 -07:00
Vladimir Mincev
bfe3d5a719 Update Production-guide.md
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
Eugen Rochko
b184c13102 Low-hanging fruit of query optimization, these indices were missing 2017-04-07 00:04:38 +02:00
YDrogen
cee4b3a359 Added masto.razrnet.fr 2017-04-06 23:59:56 +02:00
Eugen
b2410a382a Merge pull request #1100 from mjankowski/mj-reduce-image-size
Reduce size of background-photo.jpeg
2017-04-06 22:59:48 +02:00
Eugen
de9e454ba5 Merge pull request #1103 from alimony/vagrant-tweaks-01
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:58:44 +02:00
Markus Amalthea Magnuson
ed4d3c53be Add a couple of network performance tweaks to Vagrantfile. 2017-04-06 22:34:59 +02:00
Matt Jankowski
7411863663 Reduce size of background-photo.jpeg
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
Eugen
b7d04bd252 Merge pull request #1088 from Wonderfall/master
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
Tristan Mahé
fe26dd71ad Added pericles.world in the list of instances 2017-04-06 12:05:37 -07:00
Wonderfall
9e2f235405 add Docker microbadger to README.md 2017-04-06 20:59:20 +02:00
Wonderfall
b2e3d99f82 add metadata to Dockerfile 2017-04-06 20:57:16 +02:00
isati
7b92127188 Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher
a1e37a05f9 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix
7006cbe5e1 Merge branch 'master' into patch-1 2017-04-06 19:33:36 +02:00
kadiix
81bb50a15b Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00
Eugen
513456fa36 Merge pull request #1038 from wade-r/optimize-dockerfile
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
kadiix
5d5bda0c72 Merge branch 'master' into patch-1 2017-04-06 19:32:31 +02:00
Eugen
9df50099a1 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
1c8d5e7db7 Add an instance. 2017-04-06 19:15:57 +02:00
VirtuBox
4564e512e7 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +02:00
Eugen
0d8e51ecb4 Merge pull request #1048 from ashfurrow/slugignore
Updates slugignore
2017-04-06 19:09:45 +02:00
Eugen
22de99ae87 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
d1527b2d94 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
awea
6246bba93f Update List-of-Mastodon-instances.md 2017-04-06 18:07:15 +02:00
Julien
fe6a70c0f1 Add meow.social 2017-04-06 14:51:42 +02:00
Lukas Fülling
dbecfabbfe add my instance 2017-04-06 14:22:01 +02:00
Ash Furrow
07c9d0d108 Updates slugignore. 2017-04-06 07:53:48 -04:00
Ray Alez
fc62c55e32 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
983d73a311 Update List-of-Mastodon-instances.md
Add mastodon.land instance
2017-04-06 11:07:33 +02:00
Ryan Wade
ff8f101023 Optimize Dockerfile
Optimize Dockerfile, reduce build time.
2017-04-06 15:42:16 +08:00
Markus R
fa776ec958 Update List-of-Mastodon-instances.md 2017-04-06 08:52:15 +02:00
Guewen FAIVRE
51c0e1d4eb Add mastodon.elao.com instance 2017-04-06 08:46:16 +02:00
Derek Lewis
f153ff9b65 Add infinimatix.net to instance list 2017-04-06 01:15:16 -04:00
Eugen Rochko
0db2a0c7c4 Fix wrong pubsub channel on public timelines 2017-04-06 04:03:23 +02:00
Jack Michaud
5b51509eb9 Add Northeastern University Mastodon 2017-04-05 20:58:21 -04:00
Eugen
f10668da16 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
fb6459d303 Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00