fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 06:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
1962 commits 133 branches 266 tags 981 MiB
Commit graph

1962 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erwan Leboucher 0c4e9fdda0 Merge branch 'master' into patch-4 2017-04-07 12:43:56 +02:00
Eugen Rochko 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
Eugen Rochko 624a9a7136 Re-add forgotten <author> element on standalone <entry> 2017-04-07 12:21:00 +02:00
Eugen 1c351709bc Force UTF8 encoding on generated XML (#1140) 2017-04-07 11:09:14 +02:00
Eugen 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
Jason Rhodes 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
Tristan Mahé 8a4ff30ceb updated instance hostname 2017-04-06 17:18:40 -07:00
Eugen Rochko 31597fd377 Low-hanging fruit of query optimization, these indices were missing 2017-04-07 00:04:38 +02:00
YDrogen 4b08b7c502 Added masto.razrnet.fr 2017-04-06 23:59:56 +02:00
Eugen 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
Eugen 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
Markus Amalthea Magnuson 7596de1aec Add a couple of network performance tweaks to Vagrantfile. 2017-04-06 22:34:59 +02:00
Matt Jankowski 97ae53daa8 Reduce size of background-photo.jpeg 
Reduced by running through `guetzli` image optimizer.
 2017-04-06 16:24:57 -04:00
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