Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link to profile/feed/salmon from admin/accounts show page #2186

Merged

Conversation

mjankowski
Copy link
Contributor

Resolves #2183

@Gargron Gargron merged commit 7f8044d into mastodon:master Apr 20, 2017
@mjankowski mjankowski deleted the actual-links-from-accounts-admin branch April 20, 2017 09:32
aablinov added a commit to aablinov/mastodon that referenced this pull request Apr 20, 2017
* tootsuite/master: (72 commits)
  Repair most egregious mistakes in onboarding modal (mastodon#1964)
  French translation cleanup (mastodon#2223)
  Admin settings controller refactor, add specs, cleanup (mastodon#2225)
  it may be mentions_status_id_index is duplicated of index_mentions_on_status_id index. (mastodon#2224)
  Make Docker image buildable on ARM (mastodon#2065)
  Fix PropTypes warning in OnboardingModal (mastodon#2191)
  Use default locale for html lang in layouts (mastodon#2212)
  Link to profile/feed/salmon from admin/accounts show page (mastodon#2186)
  Removes timestamp from URLs. (mastodon#2185)
  Fix mastodon#2120 - Use Status#as_tag_timeline on public hashtag page (mastodon#2182)
  Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (mastodon#2180)
  Add static gif for upload testing (mastodon#2168)
  Fix mastodon#2108 - Fix gif uploads (mastodon#2171)
  Updated note about 'none' SMTP authentication method in .env.production.sample (mastodon#2167)
  Add some Spanish translatoins (mastodon#2170)
  Extract error messages to locale file (mastodon#2162)
  Dutch language strings: a few important fixes (mastodon#2163)
  Fixed hungarian translation (mastodon#2158)
  Fix css for toot button when uploading images (mastodon#2161)
  fix broken style when follower has long description (mastodon#2159)
  ...
seefood pushed a commit to Toootim/mastodon that referenced this pull request Apr 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants