Age | Commit message (Collapse) | Author |
|
|
|
|
|
Fix error when following locked accounts (#4896)
|
|
(cherry picked from commit 0ef9d45d0581dddf2f325033c43721f42fcfca9e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
the modal with launching the mute modal.
|
|
|
|
|
|
/api/v1/accounts/:id/mute endpoint
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge with upstream's 1.6.0
|
|
|
|
Merge with 1.6.0rc4
STRAP IN BUCKAWOO HERE WE GO AGAIN
|
|
|
|
|
|
I translated the additional text ( added by #4871)
|
|
|
|
|
|
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)
|
|
|
|
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
|
|
Sync with upstream @ v1.6.0rc3
ohhhhhhhhhhh heck here we go
|