Eugen
0fd73264c8
Merge pull request #632 from mcat-ee/patch-1
...
Fixed the URL
2017-02-14 03:20:44 +01:00
Tom McAtee
525d615fd7
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
6e8232e7bb
Fix #631 - Docker-deployed streaming API wasn't launched with the right environment
2017-02-13 23:10:11 +01:00
Eugen Rochko
a83dc927d8
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
Eugen
2bdd46cc26
Merge pull request #630 from yiskah/patch-6
...
Add memetastic.space to instance list
2017-02-13 20:42:40 +01:00
Eugen Rochko
1e94617a09
Add rake task for making someone into an admin
2017-02-13 20:42:02 +01:00
Eugen Rochko
03ce24d3bf
Update service timeout setting from 15s to 90s
2017-02-13 20:42:02 +01:00
shel
b2ecb316ef
Add memetastic.space
...
It's uh, it's an instance now.
2017-02-13 14:37:58 -05:00
Eugen
e3f3c44fb0
Merge pull request #629 from halcy/patch-1
...
Add https://icosahedron.website/
2017-02-13 18:43:58 +01:00
Eugen Rochko
fdc66bdf00
Merge branch 'yiskah-patch-5'
2017-02-13 18:38:31 +01:00
Eugen Rochko
edd9637e0a
Add remote mentions warning when composing a private status
2017-02-13 18:38:00 +01:00
Lorenz Diener
d315966c70
Add https://icosahedron.website/
2017-02-13 17:25:21 +01:00
Eugen Rochko
e2ae7a8e5c
Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
2017-02-13 17:22:40 +01:00
Eugen Rochko
a1d7e6773c
Clean up collapsible components
2017-02-13 17:20:18 +01:00
Eugen Rochko
f09e8f5c40
Add "next" link to Atom feeds
2017-02-13 15:38:45 +01:00
Eugen
7380c30ad9
Merge pull request #627 from halcy/style-fixes
...
Activity stream background should use $color5
2017-02-13 15:16:15 +01:00
Your Name
c6fba8b27c
Activity stream background should use $color5
2017-02-13 12:31:52 +00:00
Eugen Rochko
04b2b771c1
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
2980de5cc5
Add handler for salmons of undoing favourites
2017-02-12 19:50:18 +01:00
Eugen Rochko
8550d32165
Adding more unit tests. Fixing Salmon slaps XML
2017-02-12 17:30:15 +01:00
Eugen Rochko
f48dc93379
Deduplicate delete salmons (send only one per mentioned-account domain)
2017-02-12 17:30:15 +01:00
Eugen
2a5a04bb4b
Merge pull request #625 from ineffyble/patch-1
...
Remove toot.zone
2017-02-12 13:27:40 +01:00
Effy Elden
92ca519ac4
Remove toot.zone
...
toot.zone is being discontinued
2017-02-12 14:51:53 +11:00
Eugen Rochko
79f3ee31df
Take out private toot distribution out of PuSH again
2017-02-12 01:31:04 +01:00
Eugen Rochko
f9f8f52fe9
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
d4686e485e
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
c0be5dac90
Add privacy disclaimer
...
Add variable for text of privacy disclaimer
2017-02-11 16:47:01 -05:00
Eugen Rochko
12ed6f5712
Resolve issue with rendering authorize/reject Salmon slaps
2017-02-11 19:42:05 +01:00
Eugen Rochko
c001ef3df6
Fix Status.permitted_for scope query
2017-02-11 19:16:10 +01:00
Eugen Rochko
db53bfd30e
Fix semantics of follow requests another slaps
2017-02-11 17:13:11 +01:00
Eugen Rochko
f05f545a58
Improve docs
2017-02-11 16:21:07 +01:00
Eugen Rochko
c151a16cfb
Merge branch 'feature-privacy-federation' into development
2017-02-11 15:43:09 +01:00
Eugen Rochko
ffd58aad9d
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
ce193afa4f
Mentions in private statuses allow mentioned people to see them
2017-02-11 15:10:22 +01:00
Eugen Rochko
1e66536797
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
1dbe19291d
Fix processing of incoming authorizations/rejections
2017-02-11 13:55:07 +01:00
Eugen Rochko
79b86d7ffa
Don't PuSH-resubscribe if already subscribed
2017-02-11 13:48:28 +01:00
Eugen Rochko
59c8c2b28a
Make follow requests federate
2017-02-11 02:58:00 +01:00
Eugen Rochko
b612b57b5d
Improve public tag page
2017-02-10 23:21:01 +01:00
Eugen Rochko
39e958a6dc
Fix spoiler link color in muted context
2017-02-10 23:01:02 +01:00
Eugen Rochko
ad3aef41db
Finish up moving colors from JSX to Sass ( #584 , #348 )
2017-02-10 22:58:29 +01:00
Eugen Rochko
32580cc661
Site title is now a setting
2017-02-10 22:37:11 +01:00
Eugen
f3265f0cf1
Merge pull request #619 from yiskah/patch-4
...
Add gnusocial.me to instance list
2017-02-10 21:13:01 +01:00
shel
e352fb35a5
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
8aaecef3e5
Merge pull request #618 from yiskah/patch-3
...
Small Changes for Promotion of Other Instances
2017-02-10 19:15:21 +01:00
Eugen
caf2b68730
Merge branch 'master' into patch-3
2017-02-10 19:15:13 +01:00
Eugen
46e767ac06
Merge pull request #617 from halcy/style-changes
...
Style changes
2017-02-10 19:10:15 +01:00
shel
3f854bd75c
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
shel
059d21c0fe
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
Eugen
add86df0c2
Merge pull request #615 from nevillepark/patch-1
...
Added awoo.space
2017-02-10 18:45:19 +01:00
