Eugen Rochko
40a4053732
Disable PuSH for blocked domains
2017-02-14 04:01:37 +01:00
Eugen
94b61bdcf6
Merge pull request #632 from mcat-ee/patch-1
...
Fixed the URL
2017-02-14 03:20:44 +01:00
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
2017-02-14 12:46:18 +10:30
Eugen
f3ce9322b0
Fix #631 - Docker-deployed streaming API wasn't launched with the right environment
2017-02-13 23:10:11 +01:00
Eugen Rochko
63886bdc59
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
Eugen
bae7cf8cce
Merge pull request #630 from yiskah/patch-6
...
Add memetastic.space to instance list
2017-02-13 20:42:40 +01:00
Eugen Rochko
fae1799646
Add rake task for making someone into an admin
2017-02-13 20:42:02 +01:00
Eugen Rochko
138d21aea8
Update service timeout setting from 15s to 90s
2017-02-13 20:42:02 +01:00
shel
7a99699e2d
Add memetastic.space
...
It's uh, it's an instance now.
2017-02-13 14:37:58 -05:00
Eugen
ed9ae70487
Merge pull request #629 from halcy/patch-1
...
Add https://icosahedron.website/
2017-02-13 18:43:58 +01:00
Eugen Rochko
77df3785f1
Merge branch 'yiskah-patch-5'
2017-02-13 18:38:31 +01:00
Eugen Rochko
ec521e6bfc
Add remote mentions warning when composing a private status
2017-02-13 18:38:00 +01:00
Lorenz Diener
73210a93df
Add https://icosahedron.website/
2017-02-13 17:25:21 +01:00
Eugen Rochko
2ab7bd13e2
Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
2017-02-13 17:22:40 +01:00
Eugen Rochko
677e95031e
Clean up collapsible components
2017-02-13 17:20:18 +01:00
Eugen Rochko
2d8a4c4390
Add "next" link to Atom feeds
2017-02-13 15:38:45 +01:00
Eugen
63b3cb37db
Merge pull request #627 from halcy/style-fixes
...
Activity stream background should use $color5
2017-02-13 15:16:15 +01:00
Your Name
e4a7e8222e
Activity stream background should use $color5
2017-02-13 12:31:52 +00:00
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.
2017-02-13 13:30:33 +01:00
Eugen Rochko
df63461ff0
Add handler for salmons of undoing favourites
2017-02-12 19:50:18 +01:00
Eugen Rochko
720ff55262
Adding more unit tests. Fixing Salmon slaps XML
2017-02-12 17:30:15 +01:00
Eugen Rochko
446267d1bf
Deduplicate delete salmons (send only one per mentioned-account domain)
2017-02-12 17:30:15 +01:00
Eugen
78b3b52663
Merge pull request #625 from ineffyble/patch-1
...
Remove toot.zone
2017-02-12 13:27:40 +01:00
Effy Elden
0eee63f074
Remove toot.zone
...
toot.zone is being discontinued
2017-02-12 14:51:53 +11:00
Eugen Rochko
db814543c0
Take out private toot distribution out of PuSH again
2017-02-12 01:31:04 +01:00
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
2017-02-12 01:19:14 +01:00
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.
2017-02-11 17:42:19 -05:00
shel
3893ff1604
Add privacy disclaimer
...
Add variable for text of privacy disclaimer
2017-02-11 16:47:01 -05:00
Eugen Rochko
94d2182717
Resolve issue with rendering authorize/reject Salmon slaps
2017-02-11 19:42:05 +01:00
Eugen Rochko
31c633e528
Fix Status.permitted_for scope query
2017-02-11 19:16:10 +01:00
Eugen Rochko
50660d54e8
Fix semantics of follow requests another slaps
2017-02-11 17:13:11 +01:00
Eugen Rochko
0b95eb3612
Improve docs
2017-02-11 16:21:07 +01:00
Eugen Rochko
e6408b2e7a
Merge branch 'feature-privacy-federation' into development
2017-02-11 15:43:09 +01:00
Eugen Rochko
446aad4ce2
Make PuSH only distribute to subscriptions that match follower domains
...
Allow PuSH to distribute private toots with that condition
2017-02-11 15:41:39 +01:00
Eugen Rochko
dc851c922e
Mentions in private statuses allow mentioned people to see them
2017-02-11 15:10:22 +01:00
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
2017-02-11 14:25:01 +01:00
Eugen Rochko
e610555e10
Fix processing of incoming authorizations/rejections
2017-02-11 13:55:07 +01:00
Eugen Rochko
514fdfa268
Don't PuSH-resubscribe if already subscribed
2017-02-11 13:48:28 +01:00
Eugen Rochko
149887a0ff
Make follow requests federate
2017-02-11 02:58:00 +01:00
Eugen Rochko
d551e43a9b
Improve public tag page
2017-02-10 23:21:01 +01:00
Eugen Rochko
8cca6bc58c
Fix spoiler link color in muted context
2017-02-10 23:01:02 +01:00
Eugen Rochko
5c4c046132
Finish up moving colors from JSX to Sass ( #584 , #348 )
2017-02-10 22:58:29 +01:00
Eugen Rochko
d2619e0b53
Site title is now a setting
2017-02-10 22:37:11 +01:00
Eugen
02cbfcfe2c
Merge pull request #619 from yiskah/patch-4
...
Add gnusocial.me to instance list
2017-02-10 21:13:01 +01:00
shel
894a0515d9
Add gnusocial.me to instance list
...
I'm never going to get tired of saying "gnusocial.me is a mastodon instance"
2017-02-10 15:07:44 -05:00
Eugen
b7a92867de
Merge pull request #618 from yiskah/patch-3
...
Small Changes for Promotion of Other Instances
2017-02-10 19:15:21 +01:00
Eugen
874fffb7dc
Merge branch 'master' into patch-3
2017-02-10 19:15:13 +01:00
Eugen
73e388e0d8
Merge pull request #617 from halcy/style-changes
...
Style changes
2017-02-10 19:10:15 +01:00
shel
2d6f603c2b
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
shel
3f1f3d0827
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
