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
8 years ago
f3ce9322b0
Fix #631 - Docker-deployed streaming API wasn't launched with the right environment
8 years ago
63886bdc59
Fix #587 - Display TOTP secret next to QR code
8 years ago
bae7cf8cce
Merge pull request #630 from yiskah/patch-6
...
Add memetastic.space to instance list
8 years ago
fae1799646
Add rake task for making someone into an admin
8 years ago
138d21aea8
Update service timeout setting from 15s to 90s
8 years ago
7a99699e2d
Add memetastic.space
...
It's uh, it's an instance now.
8 years ago
ed9ae70487
Merge pull request #629 from halcy/patch-1
...
Add https://icosahedron.website/
8 years ago
77df3785f1
Merge branch 'yiskah-patch-5'
8 years ago
ec521e6bfc
Add remote mentions warning when composing a private status
8 years ago
73210a93df
Add https://icosahedron.website/
8 years ago
2ab7bd13e2
Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
8 years ago
677e95031e
Clean up collapsible components
8 years ago
2d8a4c4390
Add "next" link to Atom feeds
8 years ago
63b3cb37db
Merge pull request #627 from halcy/style-fixes
...
Activity stream background should use $color5
8 years ago
e4a7e8222e
Activity stream background should use $color5
8 years ago
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.
8 years ago
df63461ff0
Add handler for salmons of undoing favourites
8 years ago
720ff55262
Adding more unit tests. Fixing Salmon slaps XML
8 years ago
446267d1bf
Deduplicate delete salmons (send only one per mentioned-account domain)
8 years ago
78b3b52663
Merge pull request #625 from ineffyble/patch-1
...
Remove toot.zone
8 years ago
0eee63f074
Remove toot.zone
...
toot.zone is being discontinued
8 years ago
db814543c0
Take out private toot distribution out of PuSH again
8 years ago
0518492158
Stop trying to shoehorn all Salmon updates into the poor database-connected
...
StreamEntry model. Simply render Salmon slaps as they are needed
8 years ago
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.
8 years ago
3893ff1604
Add privacy disclaimer
...
Add variable for text of privacy disclaimer
8 years ago
94d2182717
Resolve issue with rendering authorize/reject Salmon slaps
8 years ago
31c633e528
Fix Status.permitted_for scope query
8 years ago
50660d54e8
Fix semantics of follow requests another slaps
8 years ago
0b95eb3612
Improve docs
8 years ago
e6408b2e7a
Merge branch 'feature-privacy-federation' into development
8 years ago
446aad4ce2
Make PuSH only distribute to subscriptions that match follower domains
...
Allow PuSH to distribute private toots with that condition
8 years ago
dc851c922e
Mentions in private statuses allow mentioned people to see them
8 years ago
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
8 years ago
e610555e10
Fix processing of incoming authorizations/rejections
8 years ago
514fdfa268
Don't PuSH-resubscribe if already subscribed
8 years ago
149887a0ff
Make follow requests federate
8 years ago
d551e43a9b
Improve public tag page
8 years ago
8cca6bc58c
Fix spoiler link color in muted context
8 years ago
5c4c046132
Finish up moving colors from JSX to Sass ( #584 , #348 )
8 years ago
d2619e0b53
Site title is now a setting
8 years ago
02cbfcfe2c
Merge pull request #619 from yiskah/patch-4
...
Add gnusocial.me to instance list
8 years ago
894a0515d9
Add gnusocial.me to instance list
...
I'm never going to get tired of saying "gnusocial.me is a mastodon instance"
8 years ago
b7a92867de
Merge pull request #618 from yiskah/patch-3
...
Small Changes for Promotion of Other Instances
8 years ago
874fffb7dc
Merge branch 'master' into patch-3
8 years ago
73e388e0d8
Merge pull request #617 from halcy/style-changes
...
Style changes
8 years ago
2d6f603c2b
Add link to other instances text
...
Text for link to other instances
8 years ago
3f1f3d0827
Add link to other instances list
...
This should help federation
8 years ago
1f1acd98f1
Merge pull request #615 from nevillepark/patch-1
...
Added awoo.space
8 years ago
a0e6c80b60
Clean up markdown
...
There were some markdown processing errors which I've cleaned up
8 years ago
Tom McAtee