From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 15 Dec 2018 09:38:54 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=65e994b29b7c3b06dc61ab5eed35b571ebafdf94;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

 Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
---

65e994b29b7c3b06dc61ab5eed35b571ebafdf94
diff --cc app/controllers/directories_controller.rb
index 9d65361a6,b8565af4b..1c8ebdac9
--- a/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@@@ -19,10 -19,10 +20,14 @@@ class DirectoriesController < Applicati
  
    private
  
 +  def set_pack
 +    use_pack 'share'
 +  end
 +
+   def check_enabled
+     return not_found unless Setting.profile_directory
+   end
+ 
    def set_tag
      @tag = Tag.discoverable.find_by!(name: params[:id].downcase)
    end
diff --cc app/controllers/settings/applications_controller.rb
index 03c890a50,ed3f82a8e..d3ac268d8
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@@ -1,7 -1,9 +1,6 @@@
  # frozen_string_literal: true
  
  class Settings::ApplicationsController < Settings::BaseController
 -  layout 'admin'
--
 -  before_action :authenticate_user!
    before_action :set_application, only: [:show, :update, :destroy, :regenerate]
    before_action :prepare_scopes, only: [:create, :update]
  
diff --cc app/controllers/settings/sessions_controller.rb
index f235dd477,11b150ffd..780ea64b4
--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@@@ -1,9 -1,7 +1,8 @@@
  # frozen_string_literal: true
  
 -class Settings::SessionsController < Settings::BaseController
 +#  Intentionally does not inherit from BaseController
 +class Settings::SessionsController < ApplicationController
    before_action :set_session, only: :destroy
-   before_action :set_body_classes
  
    def destroy
      @session.destroy!
diff --cc app/models/form/admin_settings.rb
index 8a39e09b7,eca71bf62..34c75e3bf
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@@ -46,10 -44,8 +46,12 @@@ class Form::AdminSetting
      :preview_sensitive_media=,
      :custom_css,
      :custom_css=,
+     :profile_directory,
+     :profile_directory=,
      to: Setting
    )
 +
 +  def flavour_and_skin
 +    "#{Setting.flavour}/#{Setting.skin}"
 +  end
  end
diff --cc config/locales/sk.yml
index 32bfcb8e1,5f49a2d0e..135fee51f
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@@ -788,8 -820,16 +820,15 @@@ sk
      reblogged: vyzdvihnutý
      sensitive_content: Senzitívny obsah
    terms:
-     title: Podmienky užívania, a pravidlá o súkromí pre %{instance}
+     body_html: |
+       <h2>Podmienky súkromia</h2>
+ 
+       <h3 id="collect">Aké informácie zbierame?</h3>
+ 
+       <ul>
+       <li><em>Základné informácie o účte</em>: Ak sa na tomto serveri zaregistruješ, budeš môcť byť požiadaný/á zadať prezývku, emailovú adresu a heslo. Budeš tiež môcť zadať aj ďalšie profilové údaje, ako napríklad meno a životopis, a nahrať profilovú fotku aj obrázok v záhlaví. Tvoja prezývka, meno, životopis, profilová fotka a obrázok v záhlaví sú vždy zobrazené verejne.</li><li><em>Príspevky, sledovania a iné verejné informácie</em>:
+     title: Podmienky užívania, a pravidlá súkromia pre %{instance}
    themes:
 -    contrast: Vysoký kontrast
      default: Mastodon
      mastodon-light: Mastodon (svetlý)
    time:
diff --cc config/settings.yml
index bfccd2cc7,b3d2e0240..2cac28b63
--- a/config/settings.yml
+++ b/config/settings.yml
@@@ -15,10 -15,11 +15,11 @@@ defaults: &default
    site_contact_username: ''
    site_contact_email: ''
    open_registrations: true
+   profile_directory: true
    closed_registrations_message: ''
    open_deletion: true
 +  timeline_preview: false
    min_invite_role: 'admin'
 -  timeline_preview: true
    show_staff_badge: true
    default_sensitive: false
    hide_network: false