about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-04-07Merge pull request #1146 from tootsuite/fix-object-type-nil-exceptionEugen
2017-04-07Merge pull request #1145 from tootsuite/feature-customized-default-localeEugen
2017-04-07Merge branch 'master' into fix-object-type-nil-exceptionEugen
2017-04-07Merge branch 'master' into feature-customized-default-localeEugen
2017-04-07Fix nil#object_type errorEugen Rochko
2017-04-07Update Finnish translations, add sample Minio config (#954)Jantso Porali
2017-04-07Allow setting of default language through configEugen Rochko
2017-04-07Re-add forgotten <author> element on standalone <entry>Eugen Rochko
2017-04-07Force UTF8 encoding on generated XML (#1140)Eugen
2017-04-07Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1...Eugen
2017-04-07Low-hanging fruit of query optimization, these indices were missingEugen Rochko
2017-04-06Merge pull request #1100 from mjankowski/mj-reduce-image-sizeEugen
2017-04-06Merge pull request #1103 from alimony/vagrant-tweaks-01Eugen
2017-04-06Add a couple of network performance tweaks to Vagrantfile.Markus Amalthea Magnuson
2017-04-06Reduce size of background-photo.jpegMatt Jankowski
2017-04-06Merge pull request #1088 from Wonderfall/masterEugen
2017-04-06add Docker microbadger to README.mdWonderfall
2017-04-06add metadata to DockerfileWonderfall
2017-04-06Merge pull request #1038 from wade-r/optimize-dockerfileEugen
2017-04-06Merge pull request #1042 from johnsudaar/feature/scalingo_one_clickEugen
2017-04-06Merge pull request #1048 from ashfurrow/slugignoreEugen
2017-04-06Merge pull request #1070 from alexgleason/patch-4Eugen
2017-04-06Linux users must enable NFS for VagrantAlex Gleason
2017-04-06Updates slugignore.Ash Furrow
2017-04-06Optimize DockerfileRyan Wade
2017-04-06Fix wrong pubsub channel on public timelinesEugen Rochko
2017-04-06Merge pull request #1013 from blackle/masterEugen
2017-04-06Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusSe...Eugen Rochko
2017-04-05Catch more errors in process_follows so it doesn't failblackle
2017-04-05Merge pull request #993 from foozmeat/patch-1Eugen
2017-04-05Split SalmonWorker into smaller parts, move profile updating into another jobEugen Rochko
2017-04-05Use NFS for the shared folder because it dramatically decreases latency for g...James Moore
2017-04-05Merge pull request #958 from yiskah/patch-1Eugen
2017-04-05Merge branch 'krainboltgreene-broadcast-to-worker'Eugen Rochko
2017-04-05Replace calls to FeedManager#inline_render and #broadcastEugen Rochko
2017-04-05Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mast...Eugen Rochko
2017-04-05Make sure Rabl is using OjEugen Rochko
2017-04-05Fix wrong variable used in publish channelEugen
2017-04-05Add proper message to PushUpdateWorker, use redis directlyEugen
2017-04-05Merge branch 'master' into broadcast-to-workerEugen
2017-04-05Make scalingo doc clearerJonathan Hurter
2017-04-05Fix wrong url in scalingo.jsonJonathan Hurter
2017-04-05Correct innacurate info and other fixesshel
2017-04-05Merge pull request #947 from johnsudaar/feature/scalingo_one_clickEugen
2017-04-05Add docJonathan Hurter
2017-04-05Use root repository urlJonathan Hurter
2017-04-05Add Scalingo one click on readmeJonathan Hurter
2017-04-05Merge pull request #940 from fahy/patch-1Eugen
2017-04-05Merge pull request #930 from nicobz25/patch-1Eugen
2017-04-05Merge pull request #939 from JantsoP/masterEugen