cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

author	Eugen Rochko <eugen@zeonfederated.com>
	Sun, 7 Apr 2019 02:59:13 +0000 (04:59 +0200)
committer	GitHub <noreply@github.com>
	Sun, 7 Apr 2019 02:59:13 +0000 (04:59 +0200)
commit	67b3b62b98b89f24097a2757e42bc94f1bce123c
tree	4d2b100537676e349c8d9863e6ae600cf7ac7219	tree \| snapshot
parent	0e8819f0e8729cda54231ed7a76dd10eb2083bdf	commit \| diff

Improve blocked view of profiles (#10491)

* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)"

This reverts commit 120544067fcca4bf6e71ba1ffb276c451c17c656.

* Revert "Hide blocking accounts from blocked users (#10442)"

This reverts commit 62bafa20a112ccdddaedb25723fc819dbbcd8e9a.

* Improve blocked view of profiles

- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well

26 files changed:

app/controllers/api/v1/accounts/follower_accounts_controller.rb		diff \| blob \| history
app/controllers/api/v1/accounts/following_accounts_controller.rb		diff \| blob \| history
app/controllers/api/v1/accounts/statuses_controller.rb		diff \| blob \| history
app/controllers/api/v1/accounts_controller.rb		diff \| blob \| history
app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb		diff \| blob \| history
app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb		diff \| blob \| history
app/helpers/stream_entries_helper.rb		diff \| blob \| history
app/javascript/mastodon/features/account/components/header.js		diff \| blob \| history
app/javascript/mastodon/features/account_timeline/index.js		diff \| blob \| history
app/javascript/mastodon/features/followers/index.js		diff \| blob \| history
app/javascript/mastodon/features/following/index.js		diff \| blob \| history
app/javascript/styles/mastodon/components.scss		diff \| blob \| history
app/javascript/styles/mastodon/stream_entries.scss		diff \| blob \| history
app/models/account.rb		diff \| blob \| history
app/presenters/account_relationships_presenter.rb		diff \| blob \| history
app/serializers/rest/relationship_serializer.rb		diff \| blob \| history
app/services/account_search_service.rb		diff \| blob \| history
app/services/search_service.rb		diff \| blob \| history
app/views/accounts/show.html.haml		diff \| blob \| history
app/views/follower_accounts/index.html.haml		diff \| blob \| history
app/views/following_accounts/index.html.haml		diff \| blob \| history
config/locales/en.yml		diff \| blob \| history
spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb		diff \| blob \| history
spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb		diff \| blob \| history
spec/services/account_search_service_spec.rb		diff \| blob \| history
spec/services/search_service_spec.rb		diff \| blob \| history

source code fur Kibicat Mastodon

RSS Atom