]> cat aescling's git repositories - mastodon.git/log
mastodon.git
9 years agoSite title is now a setting
Eugen Rochko [Fri, 10 Feb 2017 21:37:11 +0000 (22:37 +0100)]
Site title is now a setting

9 years agoMerge pull request #619 from yiskah/patch-4
Eugen [Fri, 10 Feb 2017 20:13:01 +0000 (21:13 +0100)]
Merge pull request #619 from yiskah/patch-4

Add gnusocial.me to instance list

9 years agoAdd gnusocial.me to instance list
shel [Fri, 10 Feb 2017 20:07:44 +0000 (15:07 -0500)]
Add gnusocial.me to instance list

I'm never going to get tired of saying "gnusocial.me is a mastodon instance"

9 years agoMerge pull request #618 from yiskah/patch-3
Eugen [Fri, 10 Feb 2017 18:15:21 +0000 (19:15 +0100)]
Merge pull request #618 from yiskah/patch-3

Small Changes for Promotion of Other Instances

9 years agoMerge branch 'master' into patch-3
Eugen [Fri, 10 Feb 2017 18:15:13 +0000 (19:15 +0100)]
Merge branch 'master' into patch-3

9 years agoMerge pull request #617 from halcy/style-changes
Eugen [Fri, 10 Feb 2017 18:10:15 +0000 (19:10 +0100)]
Merge pull request #617 from halcy/style-changes

Style changes

9 years agoAdd link to other instances text
shel [Fri, 10 Feb 2017 18:08:47 +0000 (13:08 -0500)]
Add link to other instances text

Text for link to other instances

9 years agoAdd link to other instances list
shel [Fri, 10 Feb 2017 18:06:38 +0000 (13:06 -0500)]
Add link to other instances list

This should help federation

9 years agoMerge pull request #615 from nevillepark/patch-1
Eugen [Fri, 10 Feb 2017 17:45:19 +0000 (18:45 +0100)]
Merge pull request #615 from nevillepark/patch-1

Added awoo.space

9 years agoClean up markdown
shel [Fri, 10 Feb 2017 17:14:49 +0000 (12:14 -0500)]
Clean up markdown

There were some markdown processing errors which I've cleaned up

9 years agoChange List of Instances to Table
shel [Fri, 10 Feb 2017 16:37:35 +0000 (11:37 -0500)]
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

9 years agoMove more colours to scss
Lorenz Diener [Fri, 10 Feb 2017 16:30:06 +0000 (16:30 +0000)]
Move more colours to scss

9 years agoMove more inline colours to scss
Lorenz Diener [Fri, 10 Feb 2017 15:35:19 +0000 (15:35 +0000)]
Move more inline colours to scss

9 years agoAdded awoo.space
Neville Park [Thu, 9 Feb 2017 22:57:56 +0000 (17:57 -0500)]
Added awoo.space

9 years agoFix the fix
Eugen Rochko [Thu, 9 Feb 2017 20:22:49 +0000 (21:22 +0100)]
Fix the fix

9 years agoFix #614 - extra reply-boolean on statuses to account for cases when replied-to
Eugen Rochko [Thu, 9 Feb 2017 19:25:39 +0000 (20:25 +0100)]
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

9 years agoProgress on moving color styles to Sass
Eugen Rochko [Thu, 9 Feb 2017 00:20:09 +0000 (01:20 +0100)]
Progress on moving color styles to Sass

9 years agoFix reblogs not having content warnings forwarded
Eugen [Wed, 8 Feb 2017 17:05:46 +0000 (18:05 +0100)]
Fix reblogs not having content warnings forwarded

9 years agoFix #611 - Layout setting in registrations controller
Eugen [Wed, 8 Feb 2017 02:04:29 +0000 (03:04 +0100)]
Fix #611 - Layout setting in registrations controller

9 years agoAdd postgres setup instructions to docs
Eugen Rochko [Tue, 7 Feb 2017 22:57:30 +0000 (23:57 +0100)]
Add postgres setup instructions to docs

9 years agoChange blocked users icon to fa-ban in getting started view (#608)
Isabelle Knott [Tue, 7 Feb 2017 22:48:50 +0000 (17:48 -0500)]
Change blocked users icon to fa-ban in getting started view (#608)

9 years agoMake streaming API use one pattern-matching redis pubsub connection
Eugen Rochko [Tue, 7 Feb 2017 13:37:12 +0000 (14:37 +0100)]
Make streaming API use one pattern-matching redis pubsub connection
Refresh timelines when streaming API reconnects in the UI

9 years agoMerge pull request #603 from evanminto/activitypub-account
Eugen [Tue, 7 Feb 2017 01:08:40 +0000 (02:08 +0100)]
Merge pull request #603 from evanminto/activitypub-account

Expose ActivityStreams 2.0 representation of accounts

9 years agoAdd AS2 format to RABL files
Evan Minto [Tue, 7 Feb 2017 01:00:55 +0000 (17:00 -0800)]
Add AS2 format to RABL files

9 years agoFix wrong prediction of whether toot will apear on public timeline in UI
Eugen Rochko [Mon, 6 Feb 2017 23:40:35 +0000 (00:40 +0100)]
Fix wrong prediction of whether toot will apear on public timeline in UI

9 years agoFix preferences save
Eugen Rochko [Mon, 6 Feb 2017 23:23:38 +0000 (00:23 +0100)]
Fix preferences save

9 years agoAdd "clear notifications" button, exclude posts from people who have blocked *you...
Eugen Rochko [Mon, 6 Feb 2017 23:06:40 +0000 (00:06 +0100)]
Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines

9 years agoAdd streaming API channels for local-only statuses
Eugen Rochko [Mon, 6 Feb 2017 22:46:14 +0000 (23:46 +0100)]
Add streaming API channels for local-only statuses

9 years agoAdd API modifiers to limit returned toots from public/hashtag timelines
Eugen Rochko [Mon, 6 Feb 2017 22:16:20 +0000 (23:16 +0100)]
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

9 years agoAdd trailing newline
Evan Minto [Mon, 6 Feb 2017 20:15:47 +0000 (12:15 -0800)]
Add trailing newline

9 years agoAdd test
Evan Minto [Mon, 6 Feb 2017 20:14:02 +0000 (12:14 -0800)]
Add test

9 years agoSimplify RABL
Evan Minto [Mon, 6 Feb 2017 19:39:08 +0000 (11:39 -0800)]
Simplify RABL

9 years agoReuse existing controller and route
Evan Minto [Mon, 6 Feb 2017 09:19:05 +0000 (01:19 -0800)]
Reuse existing controller and route

9 years agoAdd unique request IDs to streaming API to improve logs
Eugen Rochko [Sun, 5 Feb 2017 22:37:25 +0000 (23:37 +0100)]
Add unique request IDs to streaming API to improve logs

9 years agoDon't allow people to follow people they blocked without unblocking first
Eugen Rochko [Sun, 5 Feb 2017 19:58:09 +0000 (20:58 +0100)]
Don't allow people to follow people they blocked without unblocking first

9 years agoRemove bios from blocked users list, filter out broken entries from API response
Eugen Rochko [Sun, 5 Feb 2017 18:39:00 +0000 (19:39 +0100)]
Remove bios from blocked users list, filter out broken entries from API response

9 years agoAdd link to blocked users to getting started page
Eugen Rochko [Sun, 5 Feb 2017 18:22:05 +0000 (19:22 +0100)]
Add link to blocked users to getting started page

9 years agoFix #61 - Add list of blocked users to the UI; clean up failed push notifications API
Eugen Rochko [Sun, 5 Feb 2017 18:18:11 +0000 (19:18 +0100)]
Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API
Try to fix Travis CI setup

9 years agoRemoving failed push notification API, make context loads use cache
Eugen Rochko [Sun, 5 Feb 2017 16:51:44 +0000 (17:51 +0100)]
Removing failed push notification API, make context loads use cache

9 years agoPreheat status cache
Eugen Rochko [Sun, 5 Feb 2017 16:24:18 +0000 (17:24 +0100)]
Preheat status cache

9 years agoFix showing ellipsis even when link hasn't been cut off
Eugen Rochko [Sun, 5 Feb 2017 14:29:16 +0000 (15:29 +0100)]
Fix showing ellipsis even when link hasn't been cut off

9 years agoFix #552 - Replace image links with image icons in status text in the UI
Eugen Rochko [Sun, 5 Feb 2017 14:25:55 +0000 (15:25 +0100)]
Fix #552 - Replace image links with image icons in status text in the UI

9 years agoFix content warning margin
Eugen Rochko [Sun, 5 Feb 2017 13:50:58 +0000 (14:50 +0100)]
Fix content warning margin

9 years agoRemove react-dnd as it was interfering with text selection. Move content
Eugen Rochko [Sun, 5 Feb 2017 03:11:14 +0000 (04:11 +0100)]
Remove react-dnd as it was interfering with text selection. Move content
warning mentions preview into area where actual content would be

9 years agoAdd tracking of delay to streaming API
Eugen Rochko [Sun, 5 Feb 2017 02:19:04 +0000 (03:19 +0100)]
Add tracking of delay to streaming API

9 years agoFix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer
Eugen Rochko [Sun, 5 Feb 2017 02:01:23 +0000 (03:01 +0100)]
Fix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer
overshadow requirement for remote-lookup

9 years agoAdd next/previous navigation in modal for media attachments
Eugen Rochko [Sun, 5 Feb 2017 01:48:11 +0000 (02:48 +0100)]
Add next/previous navigation in modal for media attachments

9 years agoNo replies filter on home timeline no longer hides self-replies
Eugen Rochko [Sun, 5 Feb 2017 01:02:46 +0000 (02:02 +0100)]
No replies filter on home timeline no longer hides self-replies

9 years agoGetting started on draggable columns
Eugen Rochko [Sun, 5 Feb 2017 00:58:25 +0000 (01:58 +0100)]
Getting started on draggable columns

9 years agoMerge branch 'hoodiek-master'
Eugen Rochko [Sun, 5 Feb 2017 00:29:00 +0000 (01:29 +0100)]
Merge branch 'hoodiek-master'

9 years agoFix column settings not being scrollable on short screens
Eugen Rochko [Sun, 5 Feb 2017 00:27:31 +0000 (01:27 +0100)]
Fix column settings not being scrollable on short screens

9 years agoDisplay mentions prepended to the content warning
Eugen Rochko [Sun, 5 Feb 2017 00:19:27 +0000 (01:19 +0100)]
Display mentions prepended to the content warning

9 years agoRemove unnecessary leftover code
Evan Minto [Sat, 4 Feb 2017 22:49:24 +0000 (14:49 -0800)]
Remove unnecessary leftover code

9 years agoAdd an account endpoint for ActivityPub and link to it on HTML profile pages
Evan Minto [Sat, 4 Feb 2017 22:46:23 +0000 (14:46 -0800)]
Add an account endpoint for ActivityPub and link to it on HTML profile pages

9 years agountested!! spoiler hotfix for replies
hoodie [Sat, 4 Feb 2017 22:33:46 +0000 (17:33 -0500)]
untested!! spoiler hotfix for replies

untested, my vagrant is bugged again, submitted at gargron's request

9 years agoMake the streaming API also handle websockets (because trying to get the browser...
Eugen Rochko [Fri, 3 Feb 2017 23:34:31 +0000 (00:34 +0100)]
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.

9 years agoAdd CORS to the streaming API
Eugen Rochko [Fri, 3 Feb 2017 17:27:42 +0000 (18:27 +0100)]
Add CORS to the streaming API

9 years agoeasier comprehension of toot settings and properties (#595)
hoodie [Fri, 3 Feb 2017 14:54:23 +0000 (09:54 -0500)]
easier comprehension of toot settings and properties (#595)

sounds complex, but really it just reorganizes the posting options and
adds a seperator line

9 years agofix extraneous text in 2fa readme (#592)
James [Thu, 2 Feb 2017 23:10:22 +0000 (15:10 -0800)]
fix extraneous text in 2fa readme (#592)

9 years agoAdd tootyfruity
Eugen [Thu, 2 Feb 2017 19:27:53 +0000 (20:27 +0100)]
Add tootyfruity

9 years agoUpdate Sponsors.md
Eugen [Thu, 2 Feb 2017 19:14:02 +0000 (20:14 +0100)]
Update Sponsors.md

9 years agoUpdate Sponsors.md
Eugen [Thu, 2 Feb 2017 18:43:21 +0000 (19:43 +0100)]
Update Sponsors.md

9 years agoUpdated list of top sponsors
Eugen [Thu, 2 Feb 2017 18:40:15 +0000 (19:40 +0100)]
Updated list of top sponsors

9 years agoFix streaming API queries
Eugen Rochko [Thu, 2 Feb 2017 16:10:59 +0000 (17:10 +0100)]
Fix streaming API queries

9 years agoFix bug
Eugen Rochko [Thu, 2 Feb 2017 15:57:09 +0000 (16:57 +0100)]
Fix bug

9 years agoAdding documentation for streaming API. Fixing filtering bug
Eugen Rochko [Thu, 2 Feb 2017 15:35:06 +0000 (16:35 +0100)]
Adding documentation for streaming API. Fixing filtering bug

9 years agoMake node read the right .env file
Eugen Rochko [Thu, 2 Feb 2017 15:11:36 +0000 (16:11 +0100)]
Make node read the right .env file

9 years agoAdd redis configuration to streaming API
Eugen Rochko [Thu, 2 Feb 2017 14:29:41 +0000 (15:29 +0100)]
Add redis configuration to streaming API

9 years agoFix potential resource leaks in streaming server
Eugen Rochko [Thu, 2 Feb 2017 14:20:31 +0000 (15:20 +0100)]
Fix potential resource leaks in streaming server

9 years agoAdd logging and filtering to the node.js streaming API
Eugen Rochko [Thu, 2 Feb 2017 12:56:14 +0000 (13:56 +0100)]
Add logging and filtering to the node.js streaming API

9 years agoAdd streaming API in Node.js
Eugen Rochko [Thu, 2 Feb 2017 00:31:09 +0000 (01:31 +0100)]
Add streaming API in Node.js

9 years agoPrevent potential issue with public/hashtag statuses arriving after
Eugen Rochko [Wed, 1 Feb 2017 23:45:57 +0000 (00:45 +0100)]
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.

9 years agoMove rendering of JSON payloads for public/hashtag timelines to
Eugen Rochko [Wed, 1 Feb 2017 23:39:17 +0000 (00:39 +0100)]
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

9 years agoCleaning up format of broadcast real-time messages, removing
Eugen Rochko [Wed, 1 Feb 2017 23:03:31 +0000 (00:03 +0100)]
Cleaning up format of broadcast real-time messages, removing
redis-backed "mentions" timeline as redundant (given notifications)

9 years agoLooks like log level :debug is required for activerecord times to be tracked
Eugen Rochko [Wed, 1 Feb 2017 11:13:16 +0000 (12:13 +0100)]
Looks like log level :debug is required for activerecord times to be tracked

9 years agoFix activerecord logging in production
Eugen Rochko [Wed, 1 Feb 2017 10:34:50 +0000 (11:34 +0100)]
Fix activerecord logging in production

9 years agoFix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
Eugen Rochko [Tue, 31 Jan 2017 21:34:33 +0000 (22:34 +0100)]
Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI

9 years agoRevert to animating avatars by default
Eugen Rochko [Tue, 31 Jan 2017 18:16:35 +0000 (19:16 +0100)]
Revert to animating avatars by default

9 years agoFix elephant friend
Eugen Rochko [Tue, 31 Jan 2017 18:08:24 +0000 (19:08 +0100)]
Fix elephant friend

9 years agoFix CORS issue on avatars resampling
Eugen Rochko [Tue, 31 Jan 2017 18:05:26 +0000 (19:05 +0100)]
Fix CORS issue on avatars resampling

9 years agoFix text overlapping image in Edge and on mobile (#582)
tom [Tue, 31 Jan 2017 18:06:03 +0000 (13:06 -0500)]
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.

9 years agoAdd "open in web" link to detailed public status pages
Eugen Rochko [Mon, 30 Jan 2017 22:01:37 +0000 (23:01 +0100)]
Add "open in web" link to detailed public status pages

9 years agoFix not reloading account/fetching relationship on newly independent components
Eugen Rochko [Mon, 30 Jan 2017 21:35:36 +0000 (22:35 +0100)]
Fix not reloading account/fetching relationship on newly independent components

9 years agoMake profile header scroll along with contents. AccountTimeline, Followers and Follow...
Eugen Rochko [Mon, 30 Jan 2017 20:40:55 +0000 (21:40 +0100)]
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 />

9 years agoAdd capistrano to development environment
Eugen Rochko [Mon, 30 Jan 2017 19:03:17 +0000 (20:03 +0100)]
Add capistrano to development environment

9 years agoAdd explicit "load more" link to the bottom of StatusList and notifications
Eugen Rochko [Mon, 30 Jan 2017 17:04:15 +0000 (18:04 +0100)]
Add explicit "load more" link to the bottom of StatusList and notifications

9 years agoImprove avatar resampling of non-animated canvas
Eugen Rochko [Mon, 30 Jan 2017 14:43:48 +0000 (15:43 +0100)]
Improve avatar resampling of non-animated canvas

9 years agoMerge branch 'PurpleBooth-add-missing-back-on-follow'
Eugen Rochko [Mon, 30 Jan 2017 14:22:31 +0000 (15:22 +0100)]
Merge branch 'PurpleBooth-add-missing-back-on-follow'

9 years agoResolve confusion between ColumnBackButton and the slim version that
Eugen Rochko [Mon, 30 Jan 2017 14:22:04 +0000 (15:22 +0100)]
Resolve confusion between ColumnBackButton and the slim version that
the public timeline has been using

9 years agoAdd missing back button to "Follow Requests"
Billie Thompson [Sat, 28 Jan 2017 23:49:42 +0000 (23:49 +0000)]
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.

9 years agoAdd 2-FA instructions for non-technical users (#580)
James [Sun, 29 Jan 2017 18:26:27 +0000 (10:26 -0800)]
Add 2-FA instructions for non-technical users (#580)

9 years agoUpdate some API docs
Eugen [Sun, 29 Jan 2017 13:40:57 +0000 (14:40 +0100)]
Update some API docs

9 years agoFix avatar scaling on high-DPI displays (#573)
Misty De Meo [Sun, 29 Jan 2017 13:26:50 +0000 (05:26 -0800)]
Fix avatar scaling on high-DPI displays (#573)

9 years agoUpdate sample .env
Eugen Rochko [Sun, 29 Jan 2017 12:06:58 +0000 (13:06 +0100)]
Update sample .env

9 years agoAdd more links to main docs page
Eugen Rochko [Sun, 29 Jan 2017 11:59:02 +0000 (12:59 +0100)]
Add more links to main docs page

9 years agoFix JSON formatting in docs
Eugen Rochko [Sun, 29 Jan 2017 11:55:12 +0000 (12:55 +0100)]
Fix JSON formatting in docs

9 years agoUpdate docs with information about push notifications
Eugen Rochko [Sun, 29 Jan 2017 11:53:50 +0000 (12:53 +0100)]
Update docs with information about push notifications

9 years agoAdd tests for new API
Eugen Rochko [Sun, 29 Jan 2017 11:35:55 +0000 (12:35 +0100)]
Add tests for new API

9 years agoFix tests
Eugen Rochko [Sun, 29 Jan 2017 11:25:10 +0000 (12:25 +0100)]
Fix tests

9 years agoAPI for apps to register for push notifications
Eugen Rochko [Sun, 29 Jan 2017 00:30:32 +0000 (01:30 +0100)]
API for apps to register for push notifications