aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,604 Commits
139 Branches
281 Tags
1.1 GiB
Commit Graph

1604 Commits (bfa99981e5b9ec6b827003b60f9b54b6399e003f)
 

Author SHA1 Message Date
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'
Eugen Rochko 34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
Eugen e70661b495 Merge pull request from jkap/patch-1 
Updated list of instances for gay.crime.team
Eugen a2fa09518f Merge branch 'master' into patch-1
Eugen 3e84a86eb8 Merge pull request from TheKinrar/patch-2 
Add IPv6 column in list and remove dead instance
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.
Damien Erambert 3ed75efc31 Add fr locale for community_timeline in fr.jsx
Damien Erambert cb1989cbd8 Add locale in devise.fr.yml
Damien Erambert 03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml
Damien Erambert 9e26af264e Fix small typo in doorkeeper.fr.yml
Damien Erambert f9f6098e22 Complete localization of in simple_form.fr.yml
Damien Erambert 2c881e6717 Improve french locales on the backend (WIP)
jenn kaplan 1389d5d7fd Updated list of instances for gay.crime.team 
Updated out-of-date info for gay.crime.team
Eugen Rochko 433cb198fa Fix landing page sign up form ignoring username field
Eugen 3ffa27e812 Merge pull request from 0x70b1a5/master 
improve video button visibililty (issue )
Tobias Merkle ae43978433 improve video button visibililty
Eugen 0f05643f5d Merge pull request from Wonderfall/master 
Add social.targaryen.house to instances list
Wonderfall 7ccc9b8b02
Add social.targaryen.house to instances list
Eugen 55d275d30f Merge pull request from TheKinrar/patch-1 
Add mastodon.xyz to instances list
Eugen Rochko a8c2e44fee Fix broken reference
Eugen Rochko 808017ff18 Paperclip will complain on its own if this variable is missing
Eugen Rochko 60ebfa182f Made modal system more generic
Maxime BORGES f693ab69f3 Fix word-break in profile's note on profile page and profile component
TheKinrar 355168b939 Add mastodon.xyz to instances list
Eugen Rochko 13dfd8d109 Improve mobile tabs a little