0f4fa59812
Update heroku instructions
2017-04-07 12:50:29 -04:00
41396de7a9
Merge branch 'master' into master
2017-04-07 14:01:20 +01:00
2ac8a590cd
Moved into a comment per feedback
2017-04-07 07:43:44 -04:00
4e41cd9ab8
Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
...
Fix nil#object_type error
2017-04-07 13:08:51 +02:00
10459241a8
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
c9b23a93c7
Merge branch 'master' into fix-object-type-nil-exception
2017-04-07 13:07:36 +02:00
0adee18d73
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
8a6d8de60a
Fix nil#object_type error
2017-04-07 13:05:34 +02:00
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
0c4e9fdda0
Merge branch 'master' into patch-4
2017-04-07 12:43:56 +02:00
e3a3422a65
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
624a9a7136
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
8e7d0bda40
Update List-of-Mastodon-instances.md
2017-04-07 11:54:41 +03:00
6d6a429af8
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
5d43a9cae2
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
8a4ff30ceb
updated instance hostname
2017-04-06 17:18:40 -07:00
56f4a94e7b
Update Production-guide.md
...
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
31597fd377
Low-hanging fruit of query optimization, these indices were missing
2017-04-07 00:04:38 +02:00
4b08b7c502
Added masto.razrnet.fr
2017-04-06 23:59:56 +02:00
8cb7d157bd
Merge pull request #1100 from mjankowski/mj-reduce-image-size
...
Reduce size of background-photo.jpeg
2017-04-06 22:59:48 +02:00
acf10a2c87
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
7596de1aec
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:34:59 +02:00
97ae53daa8
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
cd77c75d6c
Merge pull request #1088 from Wonderfall/master
...
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
cfbd90cf44
Added pericles.world in the list of instances
2017-04-06 12:05:37 -07:00
ed2bfdee67
add Docker microbadger to README.md
2017-04-06 20:59:20 +02:00
a3318814e1
add metadata to Dockerfile
2017-04-06 20:57:16 +02:00
acf6436a99
Add manx.social instance
2017-04-06 19:31:25 +01:00
a0f1f9c664
Update List-of-Mastodon-instances.md
2017-04-06 20:18:56 +02:00
f0d1107c53
Merge branch 'master' into patch-1
2017-04-06 19:33:36 +02:00
02c1ad5347
Update List-of-Mastodon-instances.md
2017-04-06 19:33:17 +02:00
fa494dbb1d
Merge pull request #1038 from wade-r/optimize-dockerfile
...
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
a736b28646
Merge branch 'master' into patch-1
2017-04-06 19:32:31 +02:00
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
0d5d3c7abe
Add an instance.
2017-04-06 19:15:57 +02:00
c441208e29
Merge branch 'master' into patch-1
2017-04-06 19:11:39 +02:00
5e63828917
Merge pull request #1048 from ashfurrow/slugignore
...
Updates slugignore
2017-04-06 19:09:45 +02:00
ea86f4db15
Merge pull request #1070 from alexgleason/patch-4
...
Linux users must enable NFS for Vagrant
2017-04-06 19:02:14 +02:00
a3d204e982
Linux users must enable NFS for Vagrant
2017-04-06 12:16:39 -04:00
07495cc13f
Update List-of-Mastodon-instances.md
2017-04-06 18:07:15 +02:00
6a88151eda
Add meow.social
2017-04-06 14:51:42 +02:00
30619a6716
add my instance
2017-04-06 14:22:01 +02:00
a2adf84858
Updates slugignore.
2017-04-06 07:53:48 -04:00
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
0209b7d1b5
Update List-of-Mastodon-instances.md
...
Add mastodon.land instance
2017-04-06 11:07:33 +02:00
a2637c1720
Optimize Dockerfile
...
Optimize Dockerfile, reduce build time.
2017-04-06 15:42:16 +08:00
c62696bc46
Update List-of-Mastodon-instances.md
2017-04-06 08:52:15 +02:00
83530f0eef
Add mastodon.elao.com instance
2017-04-06 08:46:16 +02:00
73b8e67f4b
Add infinimatix.net to instance list
2017-04-06 01:15:16 -04:00
Matt Jankowski
foxiehkins
Jason Rhodes
Eugen
Jantso Porali
Erwan Leboucher
Sergei Č
Tristan Mahé
Vladimir Mincev
YDrogen
Markus Amalthea Magnuson
Wonderfall
isati
kadiix
VirtuBox
Alex Gleason
awea
Julien
Lukas Fülling
Ash Furrow
Ray Alez
Yann GUERN
Ryan Wade
Markus R
Guewen FAIVRE
Derek Lewis