about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-02-14Fixed the URLTom McAtee
Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md). I've replaced the vanilla address with one that includes a specific reference to the root of the repo
2017-02-13Fix #631 - Docker-deployed streaming API wasn't launched with the right ↵Eugen
environment
2017-02-13Fix #587 - Display TOTP secret next to QR codeEugen Rochko
2017-02-13Merge pull request #630 from yiskah/patch-6Eugen
Add memetastic.space to instance list
2017-02-13Add rake task for making someone into an adminEugen Rochko
2017-02-13Update service timeout setting from 15s to 90sEugen Rochko
2017-02-13Add memetastic.spaceshel
It's uh, it's an instance now.
2017-02-13Merge pull request #629 from halcy/patch-1Eugen
Add https://icosahedron.website/
2017-02-13Merge branch 'yiskah-patch-5'Eugen Rochko
2017-02-13Add remote mentions warning when composing a private statusEugen Rochko
2017-02-13Add https://icosahedron.website/Lorenz Diener
2017-02-13Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5Eugen Rochko
2017-02-13Clean up collapsible componentsEugen Rochko
2017-02-13Add "next" link to Atom feedsEugen Rochko
2017-02-13Merge pull request #627 from halcy/style-fixesEugen
Activity stream background should use $color5
2017-02-13Activity stream background should use $color5Your Name
2017-02-13Add IDs to salmon slaps even if they are transient. Add title, too, mostlyEugen Rochko
in case of debugging incoming salmons. Add <thr:in-reply-to /> to favourite salmons because it seems to be required by GS.
2017-02-12Add handler for salmons of undoing favouritesEugen Rochko
2017-02-12Adding more unit tests. Fixing Salmon slaps XMLEugen Rochko
2017-02-12Deduplicate delete salmons (send only one per mentioned-account domain)Eugen Rochko
2017-02-12Merge pull request #625 from ineffyble/patch-1Eugen
Remove toot.zone
2017-02-12Remove toot.zoneEffy Elden
toot.zone is being discontinued
2017-02-12Take out private toot distribution out of PuSH againEugen Rochko
2017-02-12Stop trying to shoehorn all Salmon updates into the poor database-connectedEugen Rochko
StreamEntry model. Simply render Salmon slaps as they are needed
2017-02-11Add privacy disclaimershel
I haven't had a chance to test this, because I don't currently have a fully functioning computer I can set up a dev-environment on, but this *should* make it so when a user toggles a post to be private, a disclaimer appears clarifying what "private" really means.
2017-02-11Add privacy disclaimershel
Add variable for text of privacy disclaimer
2017-02-11Resolve issue with rendering authorize/reject Salmon slapsEugen Rochko
2017-02-11Fix Status.permitted_for scope queryEugen Rochko
2017-02-11Fix semantics of follow requests another slapsEugen Rochko
2017-02-11Improve docsEugen Rochko
2017-02-11Merge branch 'feature-privacy-federation' into developmentEugen Rochko
2017-02-11Make PuSH only distribute to subscriptions that match follower domainsEugen Rochko
Allow PuSH to distribute private toots with that condition
2017-02-11Mentions in private statuses allow mentioned people to see themEugen Rochko
2017-02-11After FollowService, re-fetch remote account asynchronously, do nothingEugen Rochko
if account lock info was up to date, otherwise re-do the FollowService with now updated information
2017-02-11Fix processing of incoming authorizations/rejectionsEugen Rochko
2017-02-11Don't PuSH-resubscribe if already subscribedEugen Rochko
2017-02-11Make follow requests federateEugen Rochko
2017-02-10Improve public tag pageEugen Rochko
2017-02-10Fix spoiler link color in muted contextEugen Rochko
2017-02-10Finish up moving colors from JSX to Sass (#584, #348)Eugen Rochko
2017-02-10Site title is now a settingEugen Rochko
2017-02-10Merge pull request #619 from yiskah/patch-4Eugen
Add gnusocial.me to instance list
2017-02-10Add gnusocial.me to instance listshel
I'm never going to get tired of saying "gnusocial.me is a mastodon instance"
2017-02-10Merge pull request #618 from yiskah/patch-3Eugen
Small Changes for Promotion of Other Instances
2017-02-10Merge branch 'master' into patch-3Eugen
2017-02-10Merge pull request #617 from halcy/style-changesEugen
Style changes
2017-02-10Add link to other instances textshel
Text for link to other instances
2017-02-10Add link to other instances listshel
This should help federation
2017-02-10Merge pull request #615 from nevillepark/patch-1Eugen
Added awoo.space
2017-02-10Clean up markdownshel
There were some markdown processing errors which I've cleaned up