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
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 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
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
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
3f1f3d0827
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
Lorenz Diener
cbb962fd77
Move more colours to scss
2017-02-10 16:30:06 +00:00
Lorenz Diener
c9f42a7b85
Move more inline colours to scss
2017-02-10 15:35:19 +00:00
Eugen Rochko
0afed995ce
Fix the fix
2017-02-09 21:22:49 +01:00
Eugen Rochko
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
Eugen Rochko
c424df5192
Progress on moving color styles to Sass
2017-02-09 01:20:09 +01:00
Eugen
942a2e7d68
Fix reblogs not having content warnings forwarded
2017-02-08 18:05:46 +01:00
Eugen
d96e031dfc
Fix #611 - Layout setting in registrations controller
2017-02-08 03:04:29 +01:00
Isabelle Knott
1d273e4430
Change blocked users icon to fa-ban in getting started view ( #608 )
2017-02-07 23:48:50 +01:00
Eugen Rochko
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
Eugen
9d5fb49cd8
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
28cbb6dc21
Add AS2 format to RABL files
2017-02-06 17:00:55 -08:00
Eugen Rochko
8a081ce588
Fix wrong prediction of whether toot will apear on public timeline in UI
2017-02-07 00:40:35 +01:00
Eugen Rochko
714e41d472
Fix preferences save
2017-02-07 00:23:38 +01:00
Eugen Rochko
ac035108aa
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
c8252759df
Add streaming API channels for local-only statuses
2017-02-06 23:46:14 +01:00
Eugen Rochko
347a153b3d
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
53234e5947
Add trailing newline
2017-02-06 12:15:47 -08:00
Evan Minto
3fa5d05997
Simplify RABL
2017-02-06 11:39:08 -08:00
Evan Minto
94e213c6c1
Reuse existing controller and route
2017-02-06 01:19:26 -08:00
Eugen Rochko
0af3401553
Don't allow people to follow people they blocked without unblocking first
2017-02-05 21:04:22 +01:00
Eugen Rochko
eee8afb0b7
Remove bios from blocked users list, filter out broken entries from API response
2017-02-05 19:39:00 +01:00
Eugen Rochko
c5a08eb56e
Add link to blocked users to getting started page
2017-02-05 19:22:05 +01:00
Eugen Rochko
920ba5fc4e
Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API
...
Try to fix Travis CI setup
2017-02-05 19:18:11 +01:00
Eugen Rochko
77e13c2bc9
Removing failed push notification API, make context loads use cache
2017-02-05 17:51:44 +01:00
Eugen Rochko
19b9e1e2c3
Preheat status cache
2017-02-05 17:24:18 +01:00
Eugen Rochko
6fa4e01139
Fix showing ellipsis even when link hasn't been cut off
2017-02-05 15:29:16 +01:00
Eugen Rochko
87830f99e7
Fix #552 - Replace image links with image icons in status text in the UI
2017-02-05 15:25:55 +01:00
Eugen Rochko
ff2da21d3c
Fix content warning margin
2017-02-05 14:50:58 +01:00
Eugen Rochko
b5bf807a34
Remove react-dnd as it was interfering with text selection. Move content
...
warning mentions preview into area where actual content would be
2017-02-05 04:11:14 +01:00
Eugen Rochko
fb6aa7ad5c
Add tracking of delay to streaming API
2017-02-05 03:19:04 +01:00
Eugen Rochko
6cdcac1396
Fix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer
...
overshadow requirement for remote-lookup
2017-02-05 03:01:23 +01:00
Eugen Rochko
44fad0160f
Add next/previous navigation in modal for media attachments
2017-02-05 02:48:11 +01:00
Eugen Rochko
21972bb398
No replies filter on home timeline no longer hides self-replies
2017-02-05 02:02:46 +01:00
Eugen Rochko
dbb7e5a644
Getting started on draggable columns
2017-02-05 01:58:25 +01:00
Eugen Rochko
a012e4c7ff
Fix column settings not being scrollable on short screens
2017-02-05 01:27:31 +01:00
Eugen Rochko
af007f2def
Display mentions prepended to the content warning
2017-02-05 01:19:27 +01:00
Evan Minto
8bd8ea7c04
Remove unnecessary leftover code
2017-02-04 14:49:24 -08:00
Evan Minto
e2fbf8bc74
Add an account endpoint for ActivityPub and link to it on HTML profile pages
2017-02-04 14:46:23 -08:00
hoodie
d4d3a10c25
untested!! spoiler hotfix for replies
...
untested, my vagrant is bugged again, submitted at gargron's request
2017-02-04 17:33:46 -05:00
Eugen Rochko
ccb8ac8573
Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
...
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
2017-02-04 00:34:31 +01:00
hoodie
ac3f5a8316
easier comprehension of toot settings and properties ( #595 )
...
sounds complex, but really it just reorganizes the posting options and
adds a seperator line
2017-02-03 15:54:23 +01:00
Eugen Rochko
889b814385
Fix bug
2017-02-02 16:57:09 +01:00
Eugen Rochko
1ee4a17f37
Add logging and filtering to the node.js streaming API
2017-02-02 13:56:14 +01:00
Eugen Rochko
17ae7d132c
Prevent potential issue with public/hashtag statuses arriving after
...
they have been loaded and favourited/reblogged from another source
Since the status JSON returned from public/hashtag streams does not
contain favourited/reblogged attributes, merging them should not
override existing ones.
2017-02-02 00:49:25 +01:00
Eugen Rochko
ede04cdb24
Move rendering of JSON payloads for public/hashtag timelines to
...
FanOutOnWriteService. The only recipient-specific part on them
is reblogged/favourited. But since only newly created statuses
appear on them, it is safe to assume that both attributes would
be false
2017-02-02 00:39:17 +01:00
Eugen Rochko
d9ca46b464
Cleaning up format of broadcast real-time messages, removing
...
redis-backed "mentions" timeline as redundant (given notifications)
2017-02-02 00:03:31 +01:00
Eugen Rochko
bf60f2898d
Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
2017-01-31 22:35:38 +01:00
Eugen Rochko
8ef79d8dc9
Revert to animating avatars by default
2017-01-31 19:16:35 +01:00
Eugen Rochko
8b9c537d5a
Fix elephant friend
2017-01-31 19:08:24 +01:00
Eugen Rochko
52d68be157
Fix CORS issue on avatars resampling
2017-01-31 19:06:13 +01:00
tom
b84d1533d4
Fix text overlapping image in Edge and on mobile ( #582 )
...
Changing the way the background image is positioned and the box is sized should fix problems with the text overlapping the image on mobile browsers and Edge.
2017-01-31 19:06:03 +01:00
Eugen Rochko
c2fbd144cf
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
Eugen Rochko
86b3cb5120
Fix not reloading account/fetching relationship on newly independent components
2017-01-30 22:35:36 +01:00
Eugen Rochko
f21e7d6ac0
Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer
...
nested inside a common parent (<Account>), instead they all embed <HeaderContainer />
2017-01-30 21:44:11 +01:00
Eugen Rochko
404d2050d3
Add explicit "load more" link to the bottom of StatusList and notifications
2017-01-30 18:07:17 +01:00
Eugen Rochko
02cd2e42b2
Improve avatar resampling of non-animated canvas
2017-01-30 15:43:48 +01:00
Eugen Rochko
9bde804ba2
Resolve confusion between ColumnBackButton and the slim version that
...
the public timeline has been using
2017-01-30 15:22:04 +01:00
Billie Thompson
b1571b1e1d
Add missing back button to "Follow Requests"
...
Currently we have the problem where the follow request button is missing
from the Follow request tab. This means that when you visit that tab you
either have to press the back button in the browser or re-enter the home
page, which breaks the app flow.
This will resolve that issue by adding a new back button to that tab,
in the same way that the public timeline, and favourites have.
2017-01-29 18:53:51 +00:00
Misty De Meo
a30e669df2
Fix avatar scaling on high-DPI displays ( #573 )
2017-01-29 14:26:50 +01:00
Eugen Rochko
83ccdeb87a
Fix tests
2017-01-29 12:25:10 +01:00
Eugen Rochko
3f075c7794
API for apps to register for push notifications
2017-01-29 01:30:32 +01:00
Eugen Rochko
9b2c728251
Fix settings design on mobile
2017-01-28 21:57:03 +01:00
Eugen Rochko
23b997ae55
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
Eugen Rochko
36c57ef8af
Add pixel background to modal images
2017-01-28 04:04:09 +01:00
Eugen Rochko
f4bc9620a9
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
Eugen Rochko
04bce0cdf2
Clean up
2017-01-27 20:38:35 +01:00
Eugen Rochko
ba192f12e3
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
Zachary Spector
237cb41ab4
Less ambiguous sensitive content toggle label ( #556 )
2017-01-27 19:31:14 +01:00
hoodie
6c37285580
fix button outline showing on clicks for prettiness
...
remove button outlines on-click for retweet, boost, favourite, and reply
buttons
2017-01-27 12:39:36 -05:00
Eugen Rochko
450ad43180
Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,
...
fix ProcessFeedService pushing status into distribution if called a second time
while the first is still running (i.e. when a PuSH comes after a Salmon slap),
fix not running escape on spoiler text before emojify
2017-01-27 16:57:23 +01:00
Eugen Rochko
f8bd44a747
Fix font weight
2017-01-26 23:34:40 +01:00
