about summary refs log tree commit diff
AgeCommit message (Expand)Author
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-02Add proper error page for request timeoutsEugen Rochko
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
2017-04-02Merge branch 'master' into patch-1Eugen
2017-04-02Merge pull request #727 from TheKinrar/patch-2Eugen
2017-04-02Add IPv6 column in list and remove dead instanceTheKinrar
2017-04-01Add fr locale for community_timeline in fr.jsxDamien Erambert
2017-04-01Add locale in devise.fr.ymlDamien Erambert
2017-04-01Add french translation for "scopes" in doorkeeper.fr.ymlDamien Erambert
2017-04-01Fix small typo in doorkeeper.fr.ymlDamien Erambert
2017-04-01Complete localization of in simple_form.fr.ymlDamien Erambert
2017-04-01Improve french locales on the backend (WIP)Damien Erambert
2017-04-01Updated list of instances for gay.crime.teamjenn kaplan
2017-04-02Fix landing page sign up form ignoring username fieldEugen Rochko
2017-04-02Merge pull request #720 from 0x70b1a5/masterEugen
2017-04-01improve video button visibililtyTobias Merkle
2017-04-02Merge pull request #718 from Wonderfall/masterEugen
2017-04-01Add social.targaryen.house to instances listWonderfall
2017-04-01Merge pull request #714 from TheKinrar/patch-1Eugen
2017-04-01Fix broken referenceEugen Rochko
2017-04-01Paperclip will complain on its own if this variable is missingEugen Rochko
2017-04-01Made modal system more genericEugen Rochko
2017-04-01Fix word-break in profile's note on profile page and profile componentMaxime BORGES
2017-04-01Add mastodon.xyz to instances listTheKinrar
2017-04-01Improve mobile tabs a littleEugen Rochko
2017-03-31Fix reworked searchEugen Rochko
2017-03-31Merge pull request #706 from alexgleason/patch-3Eugen
2017-03-31Rework searchEugen Rochko
2017-03-31Put line breaks between API methods in docsAlex Gleason
2017-03-31Merge pull request #685 from yiskah/patch-2Eugen
2017-03-31Merge pull request #703 from alexgleason/patch-1Eugen
2017-03-31Mastodon is not an alternative, it is a solutionAlex Gleason
2017-03-31Merge branch 'master' into patch-2shel
2017-03-31Fix web UI profile clickable area overlapping with follow button areaEugen Rochko