mastodon/app/views/settings
Thibaut Girka 1c37ad108c 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
..
applications Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00
deletes Fix autocomplete option in haml files () 2017-07-29 14:20:31 +02:00
exports Add CSV export for lists and domain blocks () 2019-01-01 13:44:04 +01:00
featured_tags Add featured hashtags to profiles () 2019-02-04 04:25:59 +01:00
flavours Don't show skins selector when there's only one () 2018-01-08 16:45:32 -08:00
follower_domains Scrollable tables in settings pages () 2017-09-09 02:26:58 +02:00
imports Add option to overwrite imported data () 2019-02-03 03:59:51 +01:00
migrations Redesign public profiles and toots () 2018-07-28 19:25:33 +02:00
notifications Add preference for report notification e-mails, skip for duplicates () 2018-09-02 00:11:58 +02:00
preferences Make displaying application used to toot opt-in () 2019-02-02 19:18:15 +01:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
shared 2FA controller cleanup () 2017-04-22 04:23:17 +02:00
two_factor_authentication Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00
two_factor_authentications Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00