63b3cb37db
Merge pull request #627 from halcy/style-fixes
...
Activity stream background should use $color5
2017-02-13 15:16:15 +01:00
e4a7e8222e
Activity stream background should use $color5
2017-02-13 12:31:52 +00:00
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
df63461ff0
Add handler for salmons of undoing favourites
2017-02-12 19:50:18 +01:00
720ff55262
Adding more unit tests. Fixing Salmon slaps XML
2017-02-12 17:30:15 +01:00
446267d1bf
Deduplicate delete salmons (send only one per mentioned-account domain)
2017-02-12 17:30:15 +01:00
78b3b52663
Merge pull request #625 from ineffyble/patch-1
...
Remove toot.zone
2017-02-12 13:27:40 +01:00
0eee63f074
Remove toot.zone
...
toot.zone is being discontinued
2017-02-12 14:51:53 +11:00
db814543c0
Take out private toot distribution out of PuSH again
2017-02-12 01:31:04 +01:00
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
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
3893ff1604
Add privacy disclaimer
...
Add variable for text of privacy disclaimer
2017-02-11 16:47:01 -05:00
94d2182717
Resolve issue with rendering authorize/reject Salmon slaps
2017-02-11 19:42:05 +01:00
31c633e528
Fix Status.permitted_for scope query
2017-02-11 19:16:10 +01:00
50660d54e8
Fix semantics of follow requests another slaps
2017-02-11 17:13:11 +01:00
0b95eb3612
Improve docs
2017-02-11 16:21:07 +01:00
e6408b2e7a
Merge branch 'feature-privacy-federation' into development
2017-02-11 15:43:09 +01:00
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
dc851c922e
Mentions in private statuses allow mentioned people to see them
2017-02-11 15:10:22 +01:00
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
e610555e10
Fix processing of incoming authorizations/rejections
2017-02-11 13:55:07 +01:00
514fdfa268
Don't PuSH-resubscribe if already subscribed
2017-02-11 13:48:28 +01:00
149887a0ff
Make follow requests federate
2017-02-11 02:58:00 +01:00
d551e43a9b
Improve public tag page
2017-02-10 23:21:01 +01:00
8cca6bc58c
Fix spoiler link color in muted context
2017-02-10 23:01:02 +01:00
5c4c046132
Finish up moving colors from JSX to Sass ( #584 , #348 )
2017-02-10 22:58:29 +01:00
d2619e0b53
Site title is now a setting
2017-02-10 22:37:11 +01:00
02cbfcfe2c
Merge pull request #619 from yiskah/patch-4
...
Add gnusocial.me to instance list
2017-02-10 21:13:01 +01:00
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
b7a92867de
Merge pull request #618 from yiskah/patch-3
...
Small Changes for Promotion of Other Instances
2017-02-10 19:15:21 +01:00
874fffb7dc
Merge branch 'master' into patch-3
2017-02-10 19:15:13 +01:00
73e388e0d8
Merge pull request #617 from halcy/style-changes
...
Style changes
2017-02-10 19:10:15 +01:00
2d6f603c2b
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
3f1f3d0827
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
1f1acd98f1
Merge pull request #615 from nevillepark/patch-1
...
Added awoo.space
2017-02-10 18:45:19 +01:00
a0e6c80b60
Clean up markdown
...
There were some markdown processing errors which I've cleaned up
2017-02-10 12:14:49 -05:00
63a18efb27
Change List of Instances to Table
...
Change list of known instances to a table with additional information per instance. Add awoo.space and gay.crime.team
2017-02-10 11:37:35 -05:00
cbb962fd77
Move more colours to scss
2017-02-10 16:30:06 +00:00
c9f42a7b85
Move more inline colours to scss
2017-02-10 15:35:19 +00:00
e9fa557ead
Added awoo.space
2017-02-09 17:57:56 -05:00
0afed995ce
Fix the fix
2017-02-09 21:22:49 +01:00
6331ed16e5
Fix #614 - extra reply-boolean on statuses to account for cases when replied-to
...
status is not in the system at time of distribution; fix #607 - reset privacy
settings to defaults when cancelling replies
2017-02-09 20:25:39 +01:00
c424df5192
Progress on moving color styles to Sass
2017-02-09 01:20:09 +01:00
942a2e7d68
Fix reblogs not having content warnings forwarded
2017-02-08 18:05:46 +01:00
d96e031dfc
Fix #611 - Layout setting in registrations controller
2017-02-08 03:04:29 +01:00
aa1213e089
Add postgres setup instructions to docs
2017-02-07 23:57:30 +01:00
1d273e4430
Change blocked users icon to fa-ban in getting started view ( #608 )
2017-02-07 23:48:50 +01:00
02e91a96dd
Make streaming API use one pattern-matching redis pubsub connection
...
Refresh timelines when streaming API reconnects in the UI
2017-02-07 14:39:08 +01:00
9d5fb49cd8
Merge pull request #603 from evanminto/activitypub-account
...
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
28cbb6dc21
Add AS2 format to RABL files
2017-02-06 17:00:55 -08:00
