Commit graph

1338 commits

Author SHA1 Message Date
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
shel
c4036234a1 Clean up markdown
There were some markdown processing errors which I've cleaned up
2017-02-10 12:14:49 -05:00
shel
98f3eb884c 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
Lorenz Diener
37cf747049 Move more colours to scss 2017-02-10 16:30:06 +00:00
Lorenz Diener
75a8c1dd8e Move more inline colours to scss 2017-02-10 15:35:19 +00:00
Neville Park
573a0d9149 Added awoo.space 2017-02-09 17:57:56 -05:00
Eugen Rochko
f0d4a2c9b7 Fix the fix 2017-02-09 21:22:49 +01:00
Eugen Rochko
81be690f95 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
Eugen Rochko
18a0686666 Progress on moving color styles to Sass 2017-02-09 01:20:09 +01:00
Eugen
af48925ab3 Fix reblogs not having content warnings forwarded 2017-02-08 18:05:46 +01:00
Eugen
92a90de2af Fix #611 - Layout setting in registrations controller 2017-02-08 03:04:29 +01:00
Eugen Rochko
78552ab850 Add postgres setup instructions to docs 2017-02-07 23:57:30 +01:00
Isabelle Knott
06b4e585d1 Change blocked users icon to fa-ban in getting started view (#608) 2017-02-07 23:48:50 +01:00
Eugen Rochko
1f106f7955 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
Eugen
7037774d6e Merge pull request #603 from evanminto/activitypub-account
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
Evan Minto
6ed6544332 Add AS2 format to RABL files 2017-02-06 17:00:55 -08:00
Eugen Rochko
0ba2b2d54e Fix wrong prediction of whether toot will apear on public timeline in UI 2017-02-07 00:40:35 +01:00
Eugen Rochko
af82038b98 Fix preferences save 2017-02-07 00:23:38 +01:00
Eugen Rochko
94cda4cfb9 Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines 2017-02-07 00:06:40 +01:00
Eugen Rochko
eb9934c88c Add streaming API channels for local-only statuses 2017-02-06 23:46:14 +01:00
Eugen Rochko
b1f2683ecc Add API modifiers to limit returned toots from public/hashtag timelines
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
2017-02-06 23:16:20 +01:00
Evan Minto
1b42dc495c Add trailing newline 2017-02-06 12:15:47 -08:00
Evan Minto
8dfcb02bde Add test 2017-02-06 12:14:02 -08:00
Evan Minto
3c24673086 Simplify RABL 2017-02-06 11:39:08 -08:00
Evan Minto
db7affbf5b Reuse existing controller and route 2017-02-06 01:19:26 -08:00