mastodon/app/views/settings
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
applications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
deletes
exports Group reports by target account (#8674) 2018-09-13 03:44:08 +02:00
flavours Don't show skins selector when there's only one (#256) 2018-01-08 16:45:32 -08:00
follower_domains Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
imports Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
migrations Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
notifications Add preference for report notification e-mails, skip for duplicates (#8559) 2018-09-02 00:11:58 +02:00
preferences Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
shared
two_factor_authentication Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
two_factor_authentications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00