about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-09-16Fix error when following locked accounts (#4896)Eugen Rochko
(cherry picked from commit 0ef9d45d0581dddf2f325033c43721f42fcfca9e)
2017-09-14Apply white-space: nowrap to account relationships iconsSurinna Curtis
2017-09-13Tweak title text for mute notifications toggle to be clearerSurinna Curtis
2017-09-13fix typos in the migrationSurinna Curtis
2017-09-13Add migration to default Mute#hide_notifications? to trueSurinna Curtis
2017-09-13Fixed a typo that was breaking the account mute API endpointSurinna Curtis
2017-09-13minor code style fixes oopsSurinna Curtis
2017-09-13Refactor handling of default params for muting to make code cleanerSurinna Curtis
2017-09-13add an explanatory comment to AccountInteractionsSurinna Curtis
2017-09-13fix a missing importSurinna Curtis
2017-09-13In probably dead code, replace a dispatch of muteAccount that was skipping ↵Surinna Curtis
the modal with launching the mute modal.
2017-09-13satisfy eslintSurinna Curtis
2017-09-13make the hide/unhide notifications buttons workSurinna Curtis
2017-09-13Allow modifying the hide_notifications of a mute with the ↵Surinna Curtis
/api/v1/accounts/:id/mute endpoint
2017-09-13Show whether muted users' notifications are muted in account listsSurinna Curtis
2017-09-13Expose whether a mute hides notifications in the api/v1/relationships endpointSurinna Curtis
2017-09-13Add more specs for the /api/v1/mutes/details endpointSurinna Curtis
2017-09-13Define a serializer for /api/v1/mutes/detailsSurinna Curtis
2017-09-13Add a /api/v1/mutes/details route that just returns the array of mutes.Surinna Curtis
2017-09-13Put the label for the hide notifications checkbox in a label element.Surinna Curtis
2017-09-13add trailing newlines to files for Pork :)Surinna Curtis
2017-09-13specs for MuteService notifications paramsSurinna Curtis
2017-09-13Satisfy eslint.Surinna Curtis
2017-09-13Convert profile header mute to use mute modalSurinna Curtis
2017-09-13Break out a separate mute modal with a hide-notifications checkbox.Surinna Curtis
2017-09-13Less gross passing of notifications flagSurinna Curtis
2017-09-13API support for muting notifications (and specs)Surinna Curtis
2017-09-13Add support for muting notifications in MuteServiceSurinna Curtis
2017-09-13specs testing that hide_notifications in mutes actually hides notificationsSurinna Curtis
2017-09-13Add specs for how mute! interacts with muting_notifications?Surinna Curtis
2017-09-13block notifications in notify_service from hard muted accountsSurinna Curtis
2017-09-13Add muting_notifications? and a notifications argument to mute!Surinna Curtis
2017-09-13Add a hide_notifications column to mutesSurinna Curtis
2017-09-10Fix a spuriously failing spec that assumed we required short bios like upstreamSurinna Curtis
2017-09-10Remove unused importsSurinna Curtis
2017-09-10Merge pull request #143 from yipdw/sync/upstreamSurinna Curtis
Merge with upstream's 1.6.0
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4beatrix
Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
2017-09-10Bump to 1.6.0Eugen Rochko
2017-09-10Fix POST /api/v1/follows error when already following (#4878)Eugen Rochko
2017-09-10Fix Japanese translation (#4876)yoshipc
I translated the additional text ( added by #4871)
2017-09-10Bump version to 1.6.0rc5Eugen Rochko
2017-09-10Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)Eugen Rochko
2017-09-10Default follows for new users (#4871)Eugen Rochko
When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)
2017-09-10Fix dimensions of loading component for compose drawer (#4872)Eugen Rochko
2017-09-09Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4David Yip
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
2017-09-09Merge pull request #141 from yipdw/sync/upstreambeatrix
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
2017-09-09Set fallback address when empty notification address (#4868)Yamagishi Kazutoshi
2017-09-09Add missing import (patch by @MightyPork)David Yip
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip