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

1316 Commits (0a2427f79b90f82100b3a4ebe95ceb488cbb5a1d)
 

Author SHA1 Message Date
Eugen Rochko 0a2427f79b Fix - Only include innermost-level statuses in report UI 
Fix  - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses
Eugen e571a01853 Fix outdated info
Eugen Rochko 3b81baaaaf Adding POST /api/v1/reports API, and a UI for submitting reports
Eugen Rochko 40a4053732 Disable PuSH for blocked domains
Eugen 94b61bdcf6 Merge pull request from mcat-ee/patch-1 
Fixed the URL
Tom McAtee 68dba5f2eb Fixed the URL 
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
Eugen f3ce9322b0 Fix - Docker-deployed streaming API wasn't launched with the right environment
Eugen Rochko 63886bdc59 Fix - Display TOTP secret next to QR code
Eugen bae7cf8cce Merge pull request from yiskah/patch-6 
Add memetastic.space to instance list
Eugen Rochko fae1799646 Add rake task for making someone into an admin
Eugen Rochko 138d21aea8 Update service timeout setting from 15s to 90s
shel 7a99699e2d Add memetastic.space 
It's uh, it's an instance now.
Eugen ed9ae70487 Merge pull request from halcy/patch-1 
Add https://icosahedron.website/
Eugen Rochko 77df3785f1 Merge branch 'yiskah-patch-5'
Eugen Rochko ec521e6bfc Add remote mentions warning when composing a private status
Lorenz Diener 73210a93df Add https://icosahedron.website/
Eugen Rochko 2ab7bd13e2 Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
Eugen Rochko 677e95031e Clean up collapsible components
Eugen Rochko 2d8a4c4390 Add "next" link to Atom feeds
Eugen 63b3cb37db Merge pull request from halcy/style-fixes 
Activity stream background should use $color5
Your Name e4a7e8222e Activity stream background should use $color5
Eugen Rochko 8e08ae5bb9 Add IDs to salmon slaps even if they are transient. Add title, too, mostly 
in case of debugging incoming salmons. Add <thr:in-reply-to /> to favourite
salmons because it seems to be required by GS.
Eugen Rochko df63461ff0 Add handler for salmons of undoing favourites
Eugen Rochko 720ff55262 Adding more unit tests. Fixing Salmon slaps XML
Eugen Rochko 446267d1bf Deduplicate delete salmons (send only one per mentioned-account domain)
Eugen 78b3b52663 Merge pull request from ineffyble/patch-1 
Remove toot.zone
Effy Elden 0eee63f074 Remove toot.zone 
toot.zone is being discontinued
Eugen Rochko db814543c0 Take out private toot distribution out of PuSH again
Eugen Rochko 0518492158 Stop trying to shoehorn all Salmon updates into the poor database-connected 
StreamEntry model. Simply render Salmon slaps as they are needed
shel 968fae2603 Add privacy disclaimer 
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.
shel 3893ff1604 Add privacy disclaimer 
Add variable for text of privacy disclaimer
Eugen Rochko 94d2182717 Resolve issue with rendering authorize/reject Salmon slaps
Eugen Rochko 31c633e528 Fix Status.permitted_for scope query
Eugen Rochko 50660d54e8 Fix semantics of follow requests another slaps
Eugen Rochko 0b95eb3612 Improve docs
Eugen Rochko e6408b2e7a Merge branch 'feature-privacy-federation' into development
Eugen Rochko 446aad4ce2 Make PuSH only distribute to subscriptions that match follower domains 
Allow PuSH to distribute private toots with that condition
Eugen Rochko dc851c922e Mentions in private statuses allow mentioned people to see them
Eugen Rochko 00b5731ecb After FollowService, re-fetch remote account asynchronously, do nothing 
if account lock info was up to date, otherwise re-do the FollowService
with now updated information
Eugen Rochko e610555e10 Fix processing of incoming authorizations/rejections
Eugen Rochko 514fdfa268 Don't PuSH-resubscribe if already subscribed
Eugen Rochko 149887a0ff Make follow requests federate
Eugen Rochko d551e43a9b Improve public tag page
Eugen Rochko 8cca6bc58c Fix spoiler link color in muted context
Eugen Rochko 5c4c046132 Finish up moving colors from JSX to Sass (, )
Eugen Rochko d2619e0b53 Site title is now a setting
Eugen 02cbfcfe2c Merge pull request from yiskah/patch-4 
Add gnusocial.me to instance list
shel 894a0515d9 Add gnusocial.me to instance list 
I'm never going to get tired of saying "gnusocial.me is a mastodon instance"
Eugen b7a92867de Merge pull request from yiskah/patch-3 
Small Changes for Promotion of Other Instances
Eugen 874fffb7dc Merge branch 'master' into patch-3