]> cat aescling's git repositories - mastodon.git/log
mastodon.git
9 years agoImprove status reselect, do not display "load more" when no next link available
Eugen Rochko [Wed, 22 Feb 2017 15:30:09 +0000 (16:30 +0100)]
Improve status reselect, do not display "load more" when no next link available

9 years agoFix #651 - Do not reinsert original status into all followers feeds
Eugen Rochko [Wed, 22 Feb 2017 14:52:47 +0000 (15:52 +0100)]
Fix #651 - Do not reinsert original status into all followers feeds
upon un-reblogging. Check if the reblog was in the feed in the first
place. It might have been filtered on distribution.

9 years agoImprove performance of compose form
Eugen Rochko [Wed, 22 Feb 2017 14:43:07 +0000 (15:43 +0100)]
Improve performance of compose form

9 years agoFix #38 - Unread indicator when new content appears above the fold
Eugen Rochko [Mon, 20 Feb 2017 23:10:49 +0000 (00:10 +0100)]
Fix #38 - Unread indicator when new content appears above the fold

9 years agoFix scroll to top not registering because of wrong debounce usage
Eugen [Mon, 20 Feb 2017 18:01:47 +0000 (19:01 +0100)]
Fix scroll to top not registering because of wrong debounce usage

9 years agoFix links and wording
Eugen Rochko [Sun, 19 Feb 2017 21:42:38 +0000 (22:42 +0100)]
Fix links and wording

9 years agoAdjust naming of public timeline -> "local timeline" vs "whole known network"
Eugen Rochko [Sun, 19 Feb 2017 20:49:14 +0000 (21:49 +0100)]
Adjust naming of public timeline -> "local timeline" vs "whole known network"

9 years agoFix infinite scrolling breaking after navigation
Eugen Rochko [Sun, 19 Feb 2017 20:37:04 +0000 (21:37 +0100)]
Fix infinite scrolling breaking after navigation

9 years agoSplit public timeline into "public timeline" which is local, and
Eugen Rochko [Sun, 19 Feb 2017 19:25:54 +0000 (20:25 +0100)]
Split public timeline into "public timeline" which is local, and
"whole known network" which is what public timeline used to be

Only domain blocks with suspend severity will block PuSH subscriptions
Silenced accounts should not appear in conversations unless followed

9 years agoFix #642 - Add "empty column" text to home/notifications
Eugen Rochko [Sat, 18 Feb 2017 01:37:59 +0000 (02:37 +0100)]
Fix #642 - Add "empty column" text to home/notifications

9 years agoMerge pull request #643 from yiskah/patch-7
Eugen [Fri, 17 Feb 2017 20:13:47 +0000 (21:13 +0100)]
Merge pull request #643 from yiskah/patch-7

Add target="_blank" to github link under getting started

9 years agoAdd target="_blank" to github link
shel [Fri, 17 Feb 2017 19:50:50 +0000 (14:50 -0500)]
Add target="_blank" to github link

This makes so clicking the link to the github opens in a new tab or windows.

I just keep getting frustrated clicking the link to github and then losing my place in my home timeline >_> that's all

9 years agoMerge pull request #640 from mcat-ee/master
Eugen [Fri, 17 Feb 2017 12:09:21 +0000 (13:09 +0100)]
Merge pull request #640 from mcat-ee/master

Added SMTP_FROM_ADDRESS to heroku deploy config

9 years agoFrench translation update
nicolas [Fri, 17 Feb 2017 09:27:00 +0000 (10:27 +0100)]
French translation update

9 years agoAdded SMTP_FROM_ADDRESS to heroku deploy config
Tom McAtee [Fri, 17 Feb 2017 04:15:31 +0000 (14:45 +1030)]
Added SMTP_FROM_ADDRESS to heroku deploy config

Allows the user to set the address mastodon emails are maraked as being sent from

9 years agoAdd foreign key to prevent reblogs of non-existent (after race conditions) statuses...
Eugen Rochko [Fri, 17 Feb 2017 01:33:10 +0000 (02:33 +0100)]
Add foreign key to prevent reblogs of non-existent (after race conditions) statuses from happening
Fix issue with detailed status view not supporting unreblogging/unfavouriting

9 years agoDo not display non-Status stream entries anymore
Eugen Rochko [Fri, 17 Feb 2017 01:20:52 +0000 (02:20 +0100)]
Do not display non-Status stream entries anymore

9 years agoFix small styling issues
Eugen Rochko [Fri, 17 Feb 2017 01:05:15 +0000 (02:05 +0100)]
Fix small styling issues

9 years agoQuick fix for avatars with the same URL not being perceived as updated and in need...
Eugen Rochko [Fri, 17 Feb 2017 00:50:01 +0000 (01:50 +0100)]
Quick fix for avatars with the same URL not being perceived as updated and in need of re-download

9 years agoClose dropdown when clicking items
Eugen Rochko [Fri, 17 Feb 2017 00:44:06 +0000 (01:44 +0100)]
Close dropdown when clicking items

9 years agoSpeed up/optimize loading of statuses, context and cards by not re-fetching what...
Eugen Rochko [Fri, 17 Feb 2017 00:34:37 +0000 (01:34 +0100)]
Speed up/optimize loading of statuses, context and cards by not re-fetching what is already loaded

9 years agoAdd GET /api/v1/accounts/:id/statuses/media that returns only statuses with media...
Eugen Rochko [Fri, 17 Feb 2017 00:30:24 +0000 (01:30 +0100)]
Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
Make replies default to privacy settings of the status being replied to

9 years agoAdd UI to view report details, remove reported statuses, quick links to resolve/silen...
Eugen Rochko [Thu, 16 Feb 2017 23:42:52 +0000 (00:42 +0100)]
Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report

9 years agoSpeed up capistrano deployments
Eugen Rochko [Thu, 16 Feb 2017 01:34:21 +0000 (02:34 +0100)]
Speed up capistrano deployments

9 years agoAdding index overview for reports in admin UI
Eugen Rochko [Thu, 16 Feb 2017 01:28:10 +0000 (02:28 +0100)]
Adding index overview for reports in admin UI

9 years agoFix Salmon issue
Eugen Rochko [Thu, 16 Feb 2017 00:59:34 +0000 (01:59 +0100)]
Fix Salmon issue

9 years agoExpose Link headers via CORS
Eugen Rochko [Wed, 15 Feb 2017 22:26:17 +0000 (23:26 +0100)]
Expose Link headers via CORS

9 years agoFix admin UI for accounts somewhat
Eugen Rochko [Tue, 14 Feb 2017 23:22:58 +0000 (00:22 +0100)]
Fix admin UI for accounts somewhat

9 years agoFix #634 - Only include innermost-level statuses in report UI
Eugen Rochko [Tue, 14 Feb 2017 22:59:46 +0000 (23:59 +0100)]
Fix #634 - Only include innermost-level statuses in report UI
Fix #635 - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses

9 years agoFix outdated info
Eugen [Tue, 14 Feb 2017 20:33:31 +0000 (21:33 +0100)]
Fix outdated info

9 years agoAdding POST /api/v1/reports API, and a UI for submitting reports
Eugen Rochko [Tue, 14 Feb 2017 19:59:26 +0000 (20:59 +0100)]
Adding POST /api/v1/reports API, and a UI for submitting reports

9 years agoDisable PuSH for blocked domains
Eugen Rochko [Tue, 14 Feb 2017 03:01:02 +0000 (04:01 +0100)]
Disable PuSH for blocked domains

9 years agoMerge pull request #632 from mcat-ee/patch-1
Eugen [Tue, 14 Feb 2017 02:20:44 +0000 (03:20 +0100)]
Merge pull request #632 from mcat-ee/patch-1

Fixed the URL

9 years agoFixed the URL
Tom McAtee [Tue, 14 Feb 2017 02:16:18 +0000 (12:46 +1030)]
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

9 years agoFix #631 - Docker-deployed streaming API wasn't launched with the right environment
Eugen [Mon, 13 Feb 2017 22:10:11 +0000 (23:10 +0100)]
Fix #631 - Docker-deployed streaming API wasn't launched with the right environment

9 years agoFix #587 - Display TOTP secret next to QR code
Eugen Rochko [Mon, 13 Feb 2017 19:56:03 +0000 (20:56 +0100)]
Fix #587 - Display TOTP secret next to QR code

9 years agoMerge pull request #630 from yiskah/patch-6
Eugen [Mon, 13 Feb 2017 19:42:40 +0000 (20:42 +0100)]
Merge pull request #630 from yiskah/patch-6

Add memetastic.space to instance list

9 years agoAdd rake task for making someone into an admin
Eugen Rochko [Mon, 13 Feb 2017 19:41:48 +0000 (20:41 +0100)]
Add rake task for making someone into an admin

9 years agoUpdate service timeout setting from 15s to 90s
Eugen Rochko [Mon, 13 Feb 2017 19:31:45 +0000 (20:31 +0100)]
Update service timeout setting from 15s to 90s

9 years agoAdd memetastic.space
shel [Mon, 13 Feb 2017 19:37:58 +0000 (14:37 -0500)]
Add memetastic.space

It's uh, it's an instance now.

9 years agoMerge pull request #629 from halcy/patch-1
Eugen [Mon, 13 Feb 2017 17:43:58 +0000 (18:43 +0100)]
Merge pull request #629 from halcy/patch-1

Add https://icosahedron.website/

9 years agoMerge branch 'yiskah-patch-5'
Eugen Rochko [Mon, 13 Feb 2017 17:38:31 +0000 (18:38 +0100)]
Merge branch 'yiskah-patch-5'

9 years agoAdd remote mentions warning when composing a private status
Eugen Rochko [Mon, 13 Feb 2017 17:38:00 +0000 (18:38 +0100)]
Add remote mentions warning when composing a private status

9 years agoAdd https://icosahedron.website/
Lorenz Diener [Mon, 13 Feb 2017 16:25:21 +0000 (17:25 +0100)]
Add https://icosahedron.website/

9 years agoMerge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
Eugen Rochko [Mon, 13 Feb 2017 16:22:40 +0000 (17:22 +0100)]
Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5

9 years agoClean up collapsible components
Eugen Rochko [Mon, 13 Feb 2017 16:20:18 +0000 (17:20 +0100)]
Clean up collapsible components

9 years agoAdd "next" link to Atom feeds
Eugen Rochko [Mon, 13 Feb 2017 14:38:12 +0000 (15:38 +0100)]
Add "next" link to Atom feeds

9 years agoMerge pull request #627 from halcy/style-fixes
Eugen [Mon, 13 Feb 2017 14:16:15 +0000 (15:16 +0100)]
Merge pull request #627 from halcy/style-fixes

Activity stream background should use $color5

9 years agoActivity stream background should use $color5
Your Name [Mon, 13 Feb 2017 12:31:52 +0000 (12:31 +0000)]
Activity stream background should use $color5

9 years agoAdd IDs to salmon slaps even if they are transient. Add title, too, mostly
Eugen Rochko [Mon, 13 Feb 2017 12:30:33 +0000 (13:30 +0100)]
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.

9 years agoAdd handler for salmons of undoing favourites
Eugen Rochko [Sun, 12 Feb 2017 18:50:18 +0000 (19:50 +0100)]
Add handler for salmons of undoing favourites

9 years agoAdding more unit tests. Fixing Salmon slaps XML
Eugen Rochko [Sun, 12 Feb 2017 16:28:15 +0000 (17:28 +0100)]
Adding more unit tests. Fixing Salmon slaps XML

9 years agoDeduplicate delete salmons (send only one per mentioned-account domain)
Eugen Rochko [Sun, 12 Feb 2017 00:38:29 +0000 (01:38 +0100)]
Deduplicate delete salmons (send only one per mentioned-account domain)

9 years agoMerge pull request #625 from ineffyble/patch-1
Eugen [Sun, 12 Feb 2017 12:27:40 +0000 (13:27 +0100)]
Merge pull request #625 from ineffyble/patch-1

Remove toot.zone

9 years agoRemove toot.zone
Effy Elden [Sun, 12 Feb 2017 03:51:53 +0000 (14:51 +1100)]
Remove toot.zone

toot.zone is being discontinued

9 years agoTake out private toot distribution out of PuSH again
Eugen Rochko [Sun, 12 Feb 2017 00:31:04 +0000 (01:31 +0100)]
Take out private toot distribution out of PuSH again

9 years agoStop trying to shoehorn all Salmon updates into the poor database-connected
Eugen Rochko [Sat, 11 Feb 2017 23:48:53 +0000 (00:48 +0100)]
Stop trying to shoehorn all Salmon updates into the poor database-connected
StreamEntry model. Simply render Salmon slaps as they are needed

9 years agoAdd privacy disclaimer
shel [Sat, 11 Feb 2017 22:42:19 +0000 (17:42 -0500)]
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.

9 years agoAdd privacy disclaimer
shel [Sat, 11 Feb 2017 21:47:01 +0000 (16:47 -0500)]
Add privacy disclaimer

Add variable for text of privacy disclaimer

9 years agoResolve issue with rendering authorize/reject Salmon slaps
Eugen Rochko [Sat, 11 Feb 2017 18:42:05 +0000 (19:42 +0100)]
Resolve issue with rendering authorize/reject Salmon slaps

9 years agoFix Status.permitted_for scope query
Eugen Rochko [Sat, 11 Feb 2017 18:16:10 +0000 (19:16 +0100)]
Fix Status.permitted_for scope query

9 years agoFix semantics of follow requests another slaps
Eugen Rochko [Sat, 11 Feb 2017 16:09:36 +0000 (17:09 +0100)]
Fix semantics of follow requests another slaps

9 years agoImprove docs
Eugen Rochko [Sat, 11 Feb 2017 15:21:07 +0000 (16:21 +0100)]
Improve docs

9 years agoMerge branch 'feature-privacy-federation' into development
Eugen Rochko [Sat, 11 Feb 2017 14:43:09 +0000 (15:43 +0100)]
Merge branch 'feature-privacy-federation' into development

9 years agoMake PuSH only distribute to subscriptions that match follower domains
Eugen Rochko [Sat, 11 Feb 2017 14:41:39 +0000 (15:41 +0100)]
Make PuSH only distribute to subscriptions that match follower domains
Allow PuSH to distribute private toots with that condition

9 years agoMentions in private statuses allow mentioned people to see them
Eugen Rochko [Sat, 11 Feb 2017 14:10:22 +0000 (15:10 +0100)]
Mentions in private statuses allow mentioned people to see them

9 years agoAfter FollowService, re-fetch remote account asynchronously, do nothing
Eugen Rochko [Sat, 11 Feb 2017 13:12:29 +0000 (14:12 +0100)]
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

9 years agoFix processing of incoming authorizations/rejections
Eugen Rochko [Sat, 11 Feb 2017 12:55:07 +0000 (13:55 +0100)]
Fix processing of incoming authorizations/rejections

9 years agoDon't PuSH-resubscribe if already subscribed
Eugen Rochko [Sat, 11 Feb 2017 12:48:28 +0000 (13:48 +0100)]
Don't PuSH-resubscribe if already subscribed

9 years agoMake follow requests federate
Eugen Rochko [Sat, 11 Feb 2017 01:12:05 +0000 (02:12 +0100)]
Make follow requests federate

9 years agoImprove public tag page
Eugen Rochko [Fri, 10 Feb 2017 22:21:01 +0000 (23:21 +0100)]
Improve public tag page

9 years agoFix spoiler link color in muted context
Eugen Rochko [Fri, 10 Feb 2017 22:01:02 +0000 (23:01 +0100)]
Fix spoiler link color in muted context

9 years agoFinish up moving colors from JSX to Sass (#584, #348)
Eugen Rochko [Fri, 10 Feb 2017 21:58:29 +0000 (22:58 +0100)]
Finish up moving colors from JSX to Sass (#584, #348)

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