Merge branch 'improve-registration-page' into 'master'

Improve registration page and add a rules option

See merge request framasoft/mobilizon!467
This commit is contained in:
Thomas Citharel
2020-06-15 11:20:16 +02:00
28 changed files with 1329 additions and 1205 deletions

View File

@@ -73,6 +73,7 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
field(:instance_terms, :string)
field(:instance_terms_type, :instance_terms_type)
field(:instance_terms_url, :string)
field(:instance_rules, :string)
field(:registrations_open, :boolean)
end
@@ -148,6 +149,7 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
arg(:instance_terms, :string)
arg(:instance_terms_type, :instance_terms_type)
arg(:instance_terms_url, :string)
arg(:instance_rules, :string)
arg(:registrations_open, :boolean)
resolve(&Admin.save_settings/3)

View File

@@ -28,6 +28,8 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
arg(:locale, :string, default_value: "en")
resolve(&Config.terms/3)
end
field(:rules, :string, description: "The instance's rules")
end
object :terms do