about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
Fix word-break in account profiles
2017-04-02Merge pull request #735 from TheKinrar/patch-3Eugen
Add link to instances.mastodon.xyz
2017-04-02Add link to instances.mastodon.xyzTheKinrar
2017-04-02Merge branch 'master' of github.com:tootsuite/mastodonOlivia Mossberg
It's just an upstream merge
2017-04-02Fix word-break in account profilesOlivia Mossberg
word-break:break-all is a surefire way to break things. It should be set to normal. This merge just set it back to what it should be. Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected errors.
2017-04-02Fix wording "show reblogs" -> "show boosts", order reports chronologically inEugen Rochko
admin UI
2017-04-02Merge pull request #728 from bottitytto/add-mashekEugen
Adding social.mashek.net
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 ↵Eugen Rochko
maximeborges-master
2017-04-02Merge pull request #723 from jkap/patch-1Eugen
Updated list of instances for gay.crime.team
2017-04-02Merge branch 'master' into patch-1Eugen
2017-04-02Merge pull request #727 from TheKinrar/patch-2Eugen
Add IPv6 column in list and remove dead instance
2017-04-02Add IPv6 column in list and remove dead instanceTheKinrar
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances. Also, seeing this may encourage instances owner to add IPv6 support to their own.
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
Updated out-of-date info for gay.crime.team
2017-04-02Fix landing page sign up form ignoring username fieldEugen Rochko
2017-04-02Merge pull request #720 from 0x70b1a5/masterEugen
improve video button visibililty (issue #713)
2017-04-01improve video button visibililtyTobias Merkle
2017-04-02Merge pull request #718 from Wonderfall/masterEugen
Add social.targaryen.house to instances list
2017-04-01Add social.targaryen.house to instances listWonderfall
2017-04-01Merge pull request #714 from TheKinrar/patch-1Eugen
Add mastodon.xyz to instances list
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
Put line breaks between API methods in docs
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
Clarify post privacy warning
2017-03-31Merge pull request #703 from alexgleason/patch-1Eugen
Mastodon is not an alternative, it is a solution
2017-03-31Mastodon is not an alternative, it is a solutionAlex Gleason
This month I traveled to Cambridge, Massachusetts with my friends and attended LibrePlanet 2017. At the talk *Technology for direct actions*, Andrew Seeder pointed out that we often call free software an "alternative" to what exists. But an alternative is something that is mostly similar, and differentiated by preference rather than need. For instance, a trackball is an alternative to a mouse, but a jail is not an alternative to a bedroom. Andrew suggested that we start looking at free software as "solutions" rather than alternatives. So I propose boldly proclaiming that Mastodon is not an alternative to Twitter, but rather a solution to it.
2017-03-31Merge branch 'master' into patch-2shel
2017-03-31Fix web UI profile clickable area overlapping with follow button areaEugen Rochko
2017-03-31Fix some views still not using counter cachesEugen Rochko
2017-03-31Fix #700 - hide spoilers on static pagesEugen Rochko