d2358aefec
Merge branch 'master' into master
8 years ago
30df1c8476
Merge pull request #751 from Wonderfall/master
...
update Dockerfile
8 years ago
b8d2373e0b
Update Dockerfile
8 years ago
92d35c52d9
update Dockerfile
8 years ago
d7d60073f9
Merge pull request #744 from fpiesche/master
...
Add in-depth user guide
8 years ago
61894582b8
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
8 years ago
ce495138ac
Merge pull request #747 from Themimitoof/patch-1
...
add link to another mastodon instance.
8 years ago
b69e97c40b
add link to another mastodon instance.
8 years ago
c76d20c2a0
Add forgotten comma
8 years ago
590558d52c
Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
8 years ago
4f7cce25ac
Add more lcoales in fr.jsx
8 years ago
633e5ec6f6
Update French Translation
8 years ago
e92796b49c
Add info on CW tags not automatically hiding images.
8 years ago
a729d0c2b1
Add user guide to README toc
8 years ago
71cf9d0608
Fix typo in simple_form.fr.yml
8 years ago
5e45982ed9
Improve translation of data import in fr.yml
8 years ago
b829460b4a
Better translation for revoked token in doorkeeper.fr.yml
8 years ago
65e6a00817
Fix date format in doorkeeper.fr.yml
8 years ago
60a82c9022
Update to catch up with new features and add missing images.
8 years ago
b277e88aae
Write up reporting.
8 years ago
03b2f37b46
Add information about the Direct privacy setting.
8 years ago
0f274589dd
Add information on following remote users or using the Search box to find them.
8 years ago
2cd792fc3d
Merge pull request #737 from nevillepark/patch-2
...
Corrected spelling mistake
8 years ago
09b4b65fde
Merge pull request #740 from 0x70b1a5/master
...
remove black border on video mute/spoiler buttons
8 years ago
48cb2dccd2
Merge pull request #741 from eramdam/feature/improve-french-locales
...
Improve/add some French locales
8 years ago
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
aaa4d1b0fb
Keep track of which timelines are connected live to avoid redundant
...
refreshes on navigation
8 years ago
3618cc04ff
Add heartbeat to websockets streaming API connections
8 years ago
2d07cb5771
Catching rack timeout from rails doesn't work
8 years ago
f25fc04ea1
single-quotes
8 years ago
ca21be3e16
remove black border on buttons
8 years ago
5b12624847
Add proper error page for request timeouts
8 years ago
54c796c8df
Corrected spelling mistake
8 years ago
34ff11c496
Merge pull request #729 from Abzol/master
...
Fix word-break in account profiles
8 years ago
25ed563cdb
Merge pull request #735 from TheKinrar/patch-3
...
Add link to instances.mastodon.xyz
8 years ago
9f219d8968
Add link to instances.mastodon.xyz
8 years ago
30da6440d0
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
8 years ago
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
4b7dca4713
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
8 years ago
3a62721e54
Merge pull request #728 from bottitytto/add-mashek
...
Adding social.mashek.net
8 years ago
d6b965cf08
Fix issue with feed merge-in code as well
8 years ago
e809caa0e1
Fix feed regeneration bug
8 years ago
aaea7e1e7c
Adding social.mashek.net
8 years ago
750662d9e2
Merge branch 'maximeborges-master'
8 years ago
34aff3e269
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
8 years ago
e70661b495
Merge pull request #723 from jkap/patch-1
...
Updated list of instances for gay.crime.team
8 years ago
a2fa09518f
Merge branch 'master' into patch-1
8 years ago
3e84a86eb8
Merge pull request #727 from TheKinrar/patch-2
...
Add IPv6 column in list and remove dead instance
8 years ago
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
3ed75efc31
Add fr locale for community_timeline in fr.jsx
8 years ago
Eugen