mastodon-glitch/app/views/accounts
Thibaut Girka bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
2019-02-10 21:10:09 +01:00
..
_bio.html.haml Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
_header.html.haml Rename hide_followers_count helper to hide_followers_count? 2018-12-28 20:05:47 +01:00
_moved.html.haml Add rel=me to moved accounts' link (#8742) 2018-09-20 22:53:30 +02:00
_og.html.haml Add description meta tag additionally to og:description (#8941) 2018-10-10 02:21:30 +02:00
show.html.haml Fix pinned statuses being shown in a featured hashtag (#9971) 2019-02-05 00:27:18 +01:00