aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,628 Commits
152 Branches
284 Tags
1.0 GiB
Commit Graph

1628 Commits (db4a41cf58f6b15e380ff1fdbc8f392e31e4235b)
 

Author SHA1 Message Date
Valentin Lorentz fbcba65f81 Improve French translation 
Fix typos and typography. Make vocabulary and grammar more uniform.
Wonderfall b7beb4368c
use alpine-based official images
shel e2526a62e7 Add social.imirhil.fr
Eugen 61f90f15b0 Merge pull request from Kazhnuz/master 
Update French Translation
Eugen d2358aefec Merge branch 'master' into master
Eugen 30df1c8476 Merge pull request from Wonderfall/master 
update Dockerfile
Wonderfall b8d2373e0b Update Dockerfile
Wonderfall 92d35c52d9 update Dockerfile
Eugen d7d60073f9 Merge pull request from fpiesche/master 
Add in-depth user guide
Eugen 61894582b8 Merge pull request from eramdam/feature/improve-french-locales 
Feature/improve french locales (again)
Eugen ce495138ac Merge pull request from Themimitoof/patch-1 
add link to another mastodon instance.
Valentin Lorentz 9ca548c17e Also fix the start command.
Valentin Lorentz 82ae07e48b Fix install instructions. 
Closes GH-745.
Michael Vieira b69e97c40b add link to another mastodon instance.
Kazhnuz c76d20c2a0 Add forgotten comma
Florian Piesche 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
Damien Erambert 4f7cce25ac Add more lcoales in fr.jsx
Kazhnuz 633e5ec6f6 Update French Translation
Florian Piesche e92796b49c Add info on CW tags not automatically hiding images.
Florian Piesche a729d0c2b1 Add user guide to README toc
Damien Erambert 71cf9d0608 Fix typo in simple_form.fr.yml
Damien Erambert 5e45982ed9 Improve translation of data import in fr.yml
Damien Erambert b829460b4a Better translation for revoked token in doorkeeper.fr.yml
Damien Erambert 65e6a00817 Fix date format in doorkeeper.fr.yml
Florian Piesche 60a82c9022 Update to catch up with new features and add missing images.
Florian Piesche b277e88aae Write up reporting.
Florian Piesche 03b2f37b46 Add information about the Direct privacy setting.
Florian Piesche 0f274589dd Add information on following remote users or using the Search box to find them.
Eugen 2cd792fc3d Merge pull request from nevillepark/patch-2 
Corrected spelling mistake
Eugen 09b4b65fde Merge pull request from 0x70b1a5/master 
remove black border on video mute/spoiler buttons
Eugen 48cb2dccd2 Merge pull request from eramdam/feature/improve-french-locales 
Improve/add some French locales
Eugen Rochko a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong 
button would be displayed in account lists for unloaded relationships
Eugen Rochko aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant 
refreshes on navigation
Eugen Rochko 3618cc04ff Add heartbeat to websockets streaming API connections
Eugen Rochko 2d07cb5771 Catching rack timeout from rails doesn't work
Tobias Merkle f25fc04ea1 single-quotes
Tobias Merkle ca21be3e16 remove black border on buttons
Eugen Rochko 5b12624847 Add proper error page for request timeouts
Neville Park 54c796c8df Corrected spelling mistake
Eugen 34ff11c496 Merge pull request from Abzol/master 
Fix word-break in account profiles
Eugen 25ed563cdb Merge pull request from TheKinrar/patch-3 
Add link to instances.mastodon.xyz
TheKinrar 9f219d8968 Add link to instances.mastodon.xyz
Olivia Mossberg 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon 
It's just an upstream merge
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.
Eugen Rochko 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in 
admin UI
Eugen 3a62721e54 Merge pull request from bottitytto/add-mashek 
Adding social.mashek.net
Eugen Rochko d6b965cf08 Fix issue with feed merge-in code as well
Eugen Rochko e809caa0e1 Fix feed regeneration bug
Sina Mashek aaea7e1e7c Adding social.mashek.net
Eugen Rochko 750662d9e2 Merge branch 'maximeborges-master'