about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-04-02Add social.imirhil.frshel
2017-04-03Merge pull request #743 from Kazhnuz/masterEugen
2017-04-03Merge branch 'master' into masterEugen
2017-04-03Merge pull request #751 from Wonderfall/masterEugen
2017-04-03Update DockerfileWonderfall
2017-04-03update DockerfileWonderfall
2017-04-03Merge pull request #744 from fpiesche/masterEugen
2017-04-03Merge pull request #746 from eramdam/feature/improve-french-localesEugen
2017-04-03Merge pull request #747 from Themimitoof/patch-1Eugen
2017-04-03Also fix the start command.Valentin Lorentz
2017-04-03Fix install instructions.Valentin Lorentz
2017-04-03add link to another mastodon instance.Michael Vieira
2017-04-02Add forgotten commaKazhnuz
2017-04-02Update images to standard sizes. Write up Federated/Local timelines and renam...Florian Piesche
2017-04-02Add more lcoales in fr.jsxDamien Erambert
2017-04-02Update French TranslationKazhnuz
2017-04-02Add info on CW tags not automatically hiding images.Florian Piesche
2017-04-02Add user guide to README tocFlorian Piesche
2017-04-02Fix typo in simple_form.fr.ymlDamien Erambert
2017-04-02Improve translation of data import in fr.ymlDamien Erambert
2017-04-02Better translation for revoked token in doorkeeper.fr.ymlDamien Erambert
2017-04-02Fix date format in doorkeeper.fr.ymlDamien Erambert
2017-04-02Update to catch up with new features and add missing images.Florian Piesche
2017-04-02Write up reporting.Florian Piesche
2017-04-02Add information about the Direct privacy setting.Florian Piesche
2017-04-02Add information on following remote users or using the Search box to find them.Florian Piesche
2017-04-02Merge pull request #737 from nevillepark/patch-2Eugen
2017-04-02Merge pull request #740 from 0x70b1a5/masterEugen
2017-04-02Merge pull request #741 from eramdam/feature/improve-french-localesEugen
2017-04-02Avoid re-loading already loaded relationships. Also fixes issue where wrongEugen Rochko
2017-04-02Keep track of which timelines are connected live to avoid redundantEugen Rochko
2017-04-02Add heartbeat to websockets streaming API connectionsEugen Rochko
2017-04-02Catching rack timeout from rails doesn't workEugen Rochko
2017-04-02single-quotesTobias Merkle
2017-04-02remove black border on buttonsTobias Merkle
2017-04-02Add proper error page for request timeoutsEugen Rochko
2017-04-02Corrected spelling mistakeNeville Park
2017-04-02Merge pull request #729 from Abzol/masterEugen
2017-04-02Merge pull request #735 from TheKinrar/patch-3Eugen
2017-04-02Add link to instances.mastodon.xyzTheKinrar
2017-04-02Merge branch 'master' of github.com:tootsuite/mastodonOlivia Mossberg
2017-04-02Fix word-break in account profilesOlivia Mossberg
2017-04-02Fix wording "show reblogs" -> "show boosts", order reports chronologically inEugen Rochko
2017-04-02Merge pull request #728 from bottitytto/add-mashekEugen
2017-04-02Fix issue with feed merge-in code as wellEugen Rochko
2017-04-02Fix feed regeneration bugEugen Rochko
2017-04-02Adding social.mashek.netSina Mashek
2017-04-02Merge branch 'maximeborges-master'Eugen Rochko
2017-04-02Merge branch 'master' of https://github.com/maximeborges/mastodon into maxime...Eugen Rochko
2017-04-02Merge pull request #723 from jkap/patch-1Eugen