Commit Graph

1720 Commits (03adb5d7277bc1672ce3617d328280873e671b24)
 

Author SHA1 Message Date
Eugen ce495138ac Merge pull request #747 from Themimitoof/patch-1
add link to another mastodon instance.
8 years ago
Valentin Lorentz 9ca548c17e Also fix the start command. 8 years ago
Valentin Lorentz 82ae07e48b Fix install instructions.
Closes GH-745.
8 years ago
Michael Vieira b69e97c40b add link to another mastodon instance. 8 years ago
Kazhnuz c76d20c2a0 Add forgotten comma 8 years ago
Florian Piesche 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 8 years ago
Damien Erambert 4f7cce25ac Add more lcoales in fr.jsx 8 years ago
Kazhnuz 633e5ec6f6 Update French Translation 8 years ago
Florian Piesche e92796b49c Add info on CW tags not automatically hiding images. 8 years ago
Florian Piesche a729d0c2b1 Add user guide to README toc 8 years ago
Damien Erambert 71cf9d0608 Fix typo in simple_form.fr.yml 8 years ago
Damien Erambert 5e45982ed9 Improve translation of data import in fr.yml 8 years ago
Damien Erambert b829460b4a Better translation for revoked token in doorkeeper.fr.yml 8 years ago
Damien Erambert 65e6a00817 Fix date format in doorkeeper.fr.yml 8 years ago
Florian Piesche 60a82c9022 Update to catch up with new features and add missing images. 8 years ago
Florian Piesche b277e88aae Write up reporting. 8 years ago
Florian Piesche 03b2f37b46 Add information about the Direct privacy setting. 8 years ago
Florian Piesche 0f274589dd Add information on following remote users or using the Search box to find them. 8 years ago
Eugen 2cd792fc3d Merge pull request #737 from nevillepark/patch-2
Corrected spelling mistake
8 years ago
Eugen 09b4b65fde Merge pull request #740 from 0x70b1a5/master
remove black border on video mute/spoiler buttons
8 years ago
Eugen 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales
Improve/add some French locales
8 years ago
Eugen Rochko a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong
button would be displayed in account lists for unloaded relationships
8 years ago
Eugen Rochko aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant
refreshes on navigation
8 years ago
Eugen Rochko 3618cc04ff Add heartbeat to websockets streaming API connections 8 years ago
Eugen Rochko 2d07cb5771 Catching rack timeout from rails doesn't work 8 years ago
Tobias Merkle f25fc04ea1 single-quotes 8 years ago
Tobias Merkle ca21be3e16 remove black border on buttons 8 years ago
Eugen Rochko 5b12624847 Add proper error page for request timeouts 8 years ago
Neville Park 54c796c8df Corrected spelling mistake 8 years ago
Eugen 34ff11c496 Merge pull request #729 from Abzol/master
Fix word-break in account profiles
8 years ago
Eugen 25ed563cdb Merge pull request #735 from TheKinrar/patch-3
Add link to instances.mastodon.xyz
8 years ago
TheKinrar 9f219d8968 Add link to instances.mastodon.xyz 8 years ago
Olivia Mossberg 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon
It's just an upstream merge
8 years ago
Olivia Mossberg f4b5fe9caf Fix word-break in account profiles
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.
8 years ago
Eugen Rochko 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
admin UI
8 years ago
Eugen 3a62721e54 Merge pull request #728 from bottitytto/add-mashek
Adding social.mashek.net
8 years ago
Eugen Rochko d6b965cf08 Fix issue with feed merge-in code as well 8 years ago
Eugen Rochko e809caa0e1 Fix feed regeneration bug 8 years ago
Sina Mashek aaea7e1e7c Adding social.mashek.net 8 years ago
Eugen Rochko 750662d9e2 Merge branch 'maximeborges-master' 8 years ago
Eugen Rochko 34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master 8 years ago
Eugen e70661b495 Merge pull request #723 from jkap/patch-1
Updated list of instances for gay.crime.team
8 years ago
Eugen a2fa09518f Merge branch 'master' into patch-1 8 years ago
Eugen 3e84a86eb8 Merge pull request #727 from TheKinrar/patch-2
Add IPv6 column in list and remove dead instance
8 years ago
TheKinrar f5d434e433 Add IPv6 column in list and remove dead instance
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.
8 years ago
Damien Erambert 3ed75efc31 Add fr locale for community_timeline in fr.jsx 8 years ago
Damien Erambert cb1989cbd8 Add locale in devise.fr.yml 8 years ago
Damien Erambert 03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml 8 years ago
Damien Erambert 9e26af264e Fix small typo in doorkeeper.fr.yml 8 years ago
Damien Erambert f9f6098e22 Complete localization of in simple_form.fr.yml 8 years ago