]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoadd social.gestaltzerfall.net instance information
Alexander Acevedo [Sat, 4 Mar 2017 00:17:58 +0000 (19:17 -0500)]
add social.gestaltzerfall.net instance information

Hello fediverse!

8 years agoRename "the whole known network" timeline to "federated timeline"
Eugen Rochko [Fri, 3 Mar 2017 23:19:18 +0000 (00:19 +0100)]
Rename "the whole known network" timeline to "federated timeline"
Remove note about following Gargron@mastodon.social from getting started text

8 years agoAdd digest e-mails
Eugen Rochko [Fri, 3 Mar 2017 22:45:48 +0000 (23:45 +0100)]
Add digest e-mails

8 years agoMerge pull request #662 from undrskr/patch-1
Eugen [Fri, 3 Mar 2017 21:46:56 +0000 (22:46 +0100)]
Merge pull request #662 from undrskr/patch-1

gnusocial.me doesn't use Mastodon anymore

8 years agognusocial.me doesn't use Mastodon anymore
undrskr [Fri, 3 Mar 2017 20:38:10 +0000 (22:38 +0200)]
gnusocial.me doesn't use Mastodon anymore

The host uses postActiv now.

9 years agoMake confirmation text more specific
Eugen Rochko [Thu, 2 Mar 2017 18:25:11 +0000 (19:25 +0100)]
Make confirmation text more specific

9 years agoFix #620 - Add confirmation dialog for notifications clear
Eugen Rochko [Thu, 2 Mar 2017 18:24:12 +0000 (19:24 +0100)]
Fix #620 - Add confirmation dialog for notifications clear

9 years agoFix up storybook
Eugen Rochko [Thu, 2 Mar 2017 17:55:15 +0000 (18:55 +0100)]
Fix up storybook

9 years agoMerge branch 'KitRedgrave-add-mute-button'
Eugen Rochko [Thu, 2 Mar 2017 17:50:33 +0000 (18:50 +0100)]
Merge branch 'KitRedgrave-add-mute-button'

9 years agoFix #231 - Muting
Eugen Rochko [Thu, 2 Mar 2017 17:49:32 +0000 (18:49 +0100)]
Fix #231 - Muting

9 years agoMute button progress so far. WIP, doesn't entirely work correctly.
Kit Redgrave [Mon, 6 Feb 2017 01:51:56 +0000 (19:51 -0600)]
Mute button progress so far. WIP, doesn't entirely work correctly.

9 years agoFix #372 - Emoji picker
Eugen Rochko [Wed, 1 Mar 2017 23:57:55 +0000 (00:57 +0100)]
Fix #372 - Emoji picker

9 years agoMerge branch 'marrus-sh-mastodon-paste-support'
Eugen Rochko [Wed, 1 Mar 2017 12:57:44 +0000 (13:57 +0100)]
Merge branch 'marrus-sh-mastodon-paste-support'

9 years agoSimplify passing of prop
Eugen Rochko [Wed, 1 Mar 2017 12:57:30 +0000 (13:57 +0100)]
Simplify passing of prop

9 years agoMerge branch 'mastodon-paste-support' of https://github.com/marrus-sh/ardipithecus...
Eugen Rochko [Wed, 1 Mar 2017 12:54:52 +0000 (13:54 +0100)]
Merge branch 'mastodon-paste-support' of https://github.com/marrus-sh/ardipithecus into marrus-sh-mastodon-paste-support

9 years agoBetter smart/dumb component separation
Kibigo [Wed, 1 Mar 2017 10:56:15 +0000 (02:56 -0800)]
Better smart/dumb component separation

9 years agoMerge pull request #660 from marrus-sh/mastodon-smart-back-button
Eugen [Wed, 1 Mar 2017 09:50:27 +0000 (10:50 +0100)]
Merge pull request #660 from marrus-sh/mastodon-smart-back-button

#467 – Making the back button a little smarter

9 years agoMaking the back button a little smarter
Kibigo [Wed, 1 Mar 2017 06:24:34 +0000 (22:24 -0800)]
Making the back button a little smarter

9 years agoSupport for pasting images from clipboard
Kibigo [Wed, 1 Mar 2017 02:52:46 +0000 (18:52 -0800)]
Support for pasting images from clipboard

9 years agoFix incorrect detection of local vs remote user in web UI
Eugen Rochko [Wed, 1 Mar 2017 01:00:21 +0000 (02:00 +0100)]
Fix incorrect detection of local vs remote user in web UI

9 years agoFix typo
Eugen Rochko [Wed, 1 Mar 2017 00:57:48 +0000 (01:57 +0100)]
Fix typo

9 years agoRevert infinite scroll in timelines back to looking at ID of oldest
Eugen Rochko [Wed, 1 Mar 2017 00:43:29 +0000 (01:43 +0100)]
Revert infinite scroll in timelines back to looking at ID of oldest
loaded status; do not preload submitted statuses into community/public
timelines, unless those timelines have already been loaded; do not
close streaming API connections for community/public timelines, once
they have been established (most users navigate back to them eventually)

9 years agoFix #291 - Add visual indication that numbers for remote users may be inaccurate
Eugen Rochko [Wed, 1 Mar 2017 00:18:34 +0000 (01:18 +0100)]
Fix #291 - Add visual indication that numbers for remote users may be inaccurate

9 years agoIf a status is within 40 statuses from the top of a home feed, do not
Eugen Rochko [Wed, 1 Mar 2017 00:07:11 +0000 (01:07 +0100)]
If a status is within 40 statuses from the top of a home feed, do not
reinsert it when someone boosts it

9 years agoImproved dropdowns
Eugen Rochko [Tue, 28 Feb 2017 23:53:11 +0000 (00:53 +0100)]
Improved dropdowns

9 years agoFix #561 - Detect presence of audio in video, hide mute toggle when none
Eugen Rochko [Tue, 28 Feb 2017 22:48:41 +0000 (23:48 +0100)]
Fix #561 - Detect presence of audio in video, hide mute toggle when none

9 years agoMerge pull request #656 from yiskah/patch-7
Eugen [Tue, 28 Feb 2017 20:48:05 +0000 (21:48 +0100)]
Merge pull request #656 from yiskah/patch-7

Add social.diskseven.com

9 years agoAdd social.dickseven.com
shel [Tue, 28 Feb 2017 18:02:39 +0000 (13:02 -0500)]
Add social.dickseven.com

New instance

9 years agoUpdated sponsors
Eugen [Tue, 28 Feb 2017 13:58:11 +0000 (14:58 +0100)]
Updated sponsors

9 years agoFix #186 - Add RTL support to the compose form textarea and statuses output
Eugen Rochko [Tue, 28 Feb 2017 00:52:31 +0000 (01:52 +0100)]
Fix #186 - Add RTL support to the compose form textarea and statuses output

9 years agoAdd elephant friend to missing indicator
Eugen Rochko [Mon, 27 Feb 2017 23:43:36 +0000 (00:43 +0100)]
Add elephant friend to missing indicator

9 years agoAdd new illustration
Eugen [Mon, 27 Feb 2017 21:51:24 +0000 (22:51 +0100)]
Add new illustration

9 years agoMerge pull request #655 from marrus-sh/mastodon-frontend-character-count
Eugen [Mon, 27 Feb 2017 14:51:57 +0000 (15:51 +0100)]
Merge pull request #655 from marrus-sh/mastodon-frontend-character-count

Fixes #263; makes JavaScript's character counting the same as Ruby's

9 years agoCharacter counter fix
Kibigo [Mon, 27 Feb 2017 12:32:41 +0000 (04:32 -0800)]
Character counter fix

9 years agoOnly use bigger compose form/search form font on mobile layout
Eugen Rochko [Sun, 26 Feb 2017 23:46:45 +0000 (00:46 +0100)]
Only use bigger compose form/search form font on mobile layout

9 years agoFix #104 - Style OAuth authorized applications page
Eugen Rochko [Sun, 26 Feb 2017 23:15:00 +0000 (00:15 +0100)]
Fix #104 - Style OAuth authorized applications page
Add ability to search accounts by display name

9 years agoFix #612 - Set font size to 16px in compose form and search form to prevent iOS
Eugen Rochko [Sun, 26 Feb 2017 22:30:18 +0000 (23:30 +0100)]
Fix #612 - Set font size to 16px in compose form and search form to prevent iOS
from zooming in on them

9 years agoMerge branch 'rmhasan-fix_462'
Eugen Rochko [Sun, 26 Feb 2017 22:23:47 +0000 (23:23 +0100)]
Merge branch 'rmhasan-fix_462'

9 years agoAdd validation of media attachments, clean up mastodon-own exception classes
Eugen Rochko [Sun, 26 Feb 2017 22:23:06 +0000 (23:23 +0100)]
Add validation of media attachments, clean up mastodon-own exception classes

9 years agoMerge branch 'fix_462' of https://github.com/rmhasan/mastodon into rmhasan-fix_462
Eugen Rochko [Sun, 26 Feb 2017 22:09:18 +0000 (23:09 +0100)]
Merge branch 'fix_462' of https://github.com/rmhasan/mastodon into rmhasan-fix_462

9 years agoMerge branch 'rmhasan-fix_626'
Eugen Rochko [Sun, 26 Feb 2017 22:07:14 +0000 (23:07 +0100)]
Merge branch 'rmhasan-fix_626'

9 years agoAdd <MissingIndicator /> when status or account are not found, skip alerts
Eugen Rochko [Sun, 26 Feb 2017 22:06:27 +0000 (23:06 +0100)]
Add <MissingIndicator /> when status or account are not found, skip alerts
for those errors

9 years agoMerge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626
Eugen Rochko [Sun, 26 Feb 2017 21:44:31 +0000 (22:44 +0100)]
Merge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626

9 years agoFix JS require-issue
Eugen Rochko [Sun, 26 Feb 2017 13:10:01 +0000 (14:10 +0100)]
Fix JS require-issue

9 years agoFix broken dependency on inner react utility function
Eugen Rochko [Sun, 26 Feb 2017 00:34:56 +0000 (01:34 +0100)]
Fix broken dependency on inner react utility function

9 years agoFix local timeline showing unread status of TWKN timeline
Eugen Rochko [Sun, 26 Feb 2017 00:27:22 +0000 (01:27 +0100)]
Fix local timeline showing unread status of TWKN timeline

9 years agoImprove compose form performance, upgrade JS dependencies. LightingBox
Eugen Rochko [Sun, 26 Feb 2017 00:23:44 +0000 (01:23 +0100)]
Improve compose form performance, upgrade JS dependencies. LightingBox
now allows to cycle through multiple images

9 years agoAdd tuning documentation, add <content> tags back to most salmons,
Eugen Rochko [Sat, 25 Feb 2017 02:34:37 +0000 (03:34 +0100)]
Add tuning documentation, add <content> tags back to most salmons,
make status pagination headers generation more lax about next page
existing

9 years agoImprove glow
Eugen Rochko [Thu, 23 Feb 2017 01:14:35 +0000 (02:14 +0100)]
Improve glow

9 years agoSkip remote media URLs that don't have a hostname
Eugen Rochko [Wed, 22 Feb 2017 18:55:14 +0000 (19:55 +0100)]
Skip remote media URLs that don't have a hostname

9 years agoFix #555 - Use a better URL parser
Eugen Rochko [Wed, 22 Feb 2017 18:35:11 +0000 (19:35 +0100)]
Fix #555 - Use a better URL parser

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 agoadded if else clause in fetchContext
Rakib Hasan [Sun, 19 Feb 2017 10:54:27 +0000 (10:54 +0000)]
added if else clause in fetchContext
So that if we get an error, then we will
only delete status if it is an 404 error

9 years agoRemoved try clause from create action in status controller
Rakib Hasan [Fri, 17 Feb 2017 02:58:16 +0000 (02:58 +0000)]
Removed try clause from create action in status controller
Using catch statement in api_controller.rb to catch NotPermitted
Exception, and render error message

9 years agoprevious commit was creating the status regardless
Rakib Hasan [Sun, 5 Feb 2017 03:03:24 +0000 (22:03 -0500)]
previous commit was creating the status regardless
of mix of video and images in status, just wasn't rendering
the show action. I moved the validation before the status creation

9 years agorevisted fix for #462
Rakib Hasan [Fri, 3 Feb 2017 04:10:17 +0000 (23:10 -0500)]
revisted fix for #462
Moved validation to services/post_status_service.rb

9 years agoFix for issue #462
Rakib Hasan [Thu, 2 Feb 2017 02:07:38 +0000 (21:07 -0500)]
Fix for issue #462
Modified uploadCompose action to send media ids of attached
media when sending a request. Modified create method in MediaController
to check if when posting a video, there are no other media attached
to the status by looking at the media ids sent from the uploadCompose
action.

9 years agoRemoving dispatch of fetchContextFail
Rakib Hasan [Sun, 19 Feb 2017 08:13:57 +0000 (08:13 +0000)]
Removing dispatch of fetchContextFail
No need to flash error message when status is not found.
The column will display the message "status not found"

9 years agoadding new react class StatusNotFound
Rakib Hasan [Sun, 19 Feb 2017 07:42:03 +0000 (07:42 +0000)]
adding new react class StatusNotFound

9 years agoFixing issue #626
Rakib Hasan [Sun, 19 Feb 2017 07:32:35 +0000 (07:32 +0000)]
Fixing issue #626
The status is not showing anymore after clicking on it

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/