about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-03Merge pull request #746 from eramdam/feature/improve-french-localesEugen
Feature/improve french locales (again)
2017-04-03Merge pull request #747 from Themimitoof/patch-1Eugen
add link to another mastodon instance.
2017-04-03add link to another mastodon instance.Michael Vieira
2017-04-02Add more lcoales in fr.jsxDamien Erambert
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-02Merge pull request #737 from nevillepark/patch-2Eugen
Corrected spelling mistake
2017-04-02Merge pull request #740 from 0x70b1a5/masterEugen
remove black border on video mute/spoiler buttons
2017-04-02Merge pull request #741 from eramdam/feature/improve-french-localesEugen
Improve/add some French locales
2017-04-02Avoid re-loading already loaded relationships. Also fixes issue where wrongEugen Rochko
button would be displayed in account lists for unloaded relationships
2017-04-02Keep track of which timelines are connected live to avoid redundantEugen Rochko
refreshes on navigation
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
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
generated by cgit-pink (git 2.37.1) at 2024-11-07 12:52:59 +0000