mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2017-04-03	Merge pull request #768 from marvinkopf/mutedropdown	Eugen
	add mute option in status dropdown
2017-04-03	add mute option in status dropdown	Marvin Kopf

2017-04-03	Merge pull request #760 from ProgVal/patch-2	Eugen
	Improve French translation
2017-04-03	Merge pull request #757 from yiskah/patch-4	Eugen
	Add social.imirhil.fr
2017-04-03	Merge pull request #759 from Wonderfall/master	Eugen
	use alpine-based official images
2017-04-03	Merge pull request #748 from ProgVal/patch-1	Eugen
	Fix install instructions.
2017-04-03	Improve French translation	Valentin Lorentz
	Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03	use alpine-based official images	Wonderfall

2017-04-02	Add social.imirhil.fr	shel

2017-04-03	Merge pull request #743 from Kazhnuz/master	Eugen
	Update French Translation
2017-04-03	Merge branch 'master' into master	Eugen

2017-04-03	Merge pull request #751 from Wonderfall/master	Eugen
	update Dockerfile
2017-04-03	Update Dockerfile	Wonderfall

2017-04-03	update Dockerfile	Wonderfall

2017-04-03	Merge pull request #744 from fpiesche/master	Eugen
	Add in-depth user guide
2017-04-03	Merge pull request #746 from eramdam/feature/improve-french-locales	Eugen
	Feature/improve french locales (again)
2017-04-03	Merge pull request #747 from Themimitoof/patch-1	Eugen
	add link to another mastodon instance.
2017-04-03	Also fix the start command.	Valentin Lorentz

2017-04-03	Fix install instructions.	Valentin Lorentz
	Closes GH-745.
2017-04-03	add link to another mastodon instance.	Michael Vieira

2017-04-02	Add forgotten comma	Kazhnuz

2017-04-02	Update images to standard sizes. Write up Federated/Local timelines and ↵	Florian Piesche
	rename relevant image.
2017-04-02	Add more lcoales in fr.jsx	Damien Erambert

2017-04-02	Update French Translation	Kazhnuz

2017-04-02	Add info on CW tags not automatically hiding images.	Florian Piesche

2017-04-02	Add user guide to README toc	Florian Piesche

2017-04-02	Fix typo in simple_form.fr.yml	Damien Erambert

2017-04-02	Improve translation of data import in fr.yml	Damien Erambert

2017-04-02	Better translation for revoked token in doorkeeper.fr.yml	Damien Erambert

2017-04-02	Fix date format in doorkeeper.fr.yml	Damien Erambert

2017-04-02	Update to catch up with new features and add missing images.	Florian Piesche

2017-04-02	Write up reporting.	Florian Piesche

2017-04-02	Add information about the Direct privacy setting.	Florian Piesche

2017-04-02	Add information on following remote users or using the Search box to find them.	Florian Piesche

2017-04-02	Merge pull request #737 from nevillepark/patch-2	Eugen
	Corrected spelling mistake
2017-04-02	Merge pull request #740 from 0x70b1a5/master	Eugen
	remove black border on video mute/spoiler buttons
2017-04-02	Merge pull request #741 from eramdam/feature/improve-french-locales	Eugen
	Improve/add some French locales
2017-04-02	Avoid re-loading already loaded relationships. Also fixes issue where wrong	Eugen Rochko
	button would be displayed in account lists for unloaded relationships
2017-04-02	Keep track of which timelines are connected live to avoid redundant	Eugen Rochko
	refreshes on navigation
2017-04-02	Add heartbeat to websockets streaming API connections	Eugen Rochko

2017-04-02	Catching rack timeout from rails doesn't work	Eugen Rochko

2017-04-02	single-quotes	Tobias Merkle

2017-04-02	remove black border on buttons	Tobias Merkle

2017-04-02	Add proper error page for request timeouts	Eugen Rochko

2017-04-02	Corrected spelling mistake	Neville Park

2017-04-02	Merge pull request #729 from Abzol/master	Eugen
	Fix word-break in account profiles
2017-04-02	Merge pull request #735 from TheKinrar/patch-3	Eugen
	Add link to instances.mastodon.xyz
2017-04-02	Add link to instances.mastodon.xyz	TheKinrar

2017-04-02	Merge branch 'master' of github.com:tootsuite/mastodon	Olivia Mossberg
	It's just an upstream merge
2017-04-02	Fix word-break in account profiles	Olivia 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.