Skip to content
Snippets Groups Projects
Commit 64fd8354 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '612-clearing-theme-colours-breaks-scss-compilation' into 'master'

Resolve "Clearing theme colours breaks SCSS compilation"

Closes #612

See merge request !916
parents 88bb3188 d4d93f5d
No related branches found
No related tags found
1 merge request!916Resolve "Clearing theme colours breaks SCSS compilation"
Pipeline #50418 passed
Pipeline: AlekSIS

#50420

    ......@@ -15,6 +15,7 @@ Fixed
    * Signup was forbidden even if it was enabled in settings
    * Phone numbers were not properly linked and suboptimally formatted on person page
    * Favicon upload failed with S3 storage.
    * Some preferences were required when they shouldn't, and vice versa.
    `2.6`_ - 2022-01-10
    -------------------
    ......
    ......@@ -40,7 +40,6 @@ class SiteTitle(StringPreference):
    section = general
    name = "title"
    default = "AlekSIS"
    required = False
    verbose_name = _("Site title")
    ......@@ -62,7 +61,6 @@ class ColourPrimary(StringPreference):
    section = theme
    name = "primary"
    default = "#0d5eaf"
    required = False
    verbose_name = _("Primary colour")
    widget = ColorWidget
    ......@@ -74,7 +72,6 @@ class ColourSecondary(StringPreference):
    section = theme
    name = "secondary"
    default = "#0d5eaf"
    required = False
    verbose_name = _("Secondary colour")
    widget = ColorWidget
    ......@@ -116,7 +113,6 @@ class MailOutName(StringPreference):
    section = mail
    name = "name"
    default = "AlekSIS"
    required = False
    verbose_name = _("Mail out name")
    ......@@ -127,7 +123,6 @@ class MailOut(StringPreference):
    section = mail
    name = "address"
    default = settings.DEFAULT_FROM_EMAIL
    required = False
    verbose_name = _("Mail out address")
    field_class = EmailField
    ......@@ -163,7 +158,6 @@ class AdressingNameFormat(ChoicePreference):
    section = notification
    name = "addressing_name_format"
    default = "first_last"
    required = False
    verbose_name = _("Name format for addressing")
    choices = (
    ("first_last", "John Doe"),
    ......@@ -300,6 +294,7 @@ class OAuthAllowedGrants(MultipleChoicePreference):
    verbose_name = _("Allowed Grant Flows for OAuth applications")
    field_attribute = {"initial": []}
    choices = AbstractApplication.GRANT_TYPES
    required = False
    @site_preferences_registry.register
    ......@@ -376,6 +371,7 @@ class EditableFieldsPerson(MultipleChoicePreference):
    verbose_name = _("Fields on person model which are editable by themselves.")
    field_attribute = {"initial": []}
    choices = [(field.name, field.name) for field in Person.syncable_fields()]
    required = False
    @site_preferences_registry.register
    ......@@ -391,6 +387,7 @@ class SendNotificationOnPersonChange(MultipleChoicePreference):
    )
    field_attribute = {"initial": []}
    choices = [(field.name, field.name) for field in Person.syncable_fields()]
    required = False
    @site_preferences_registry.register
    ......@@ -401,6 +398,7 @@ class PersonChangeNotificationContact(StringPreference):
    name = "person_change_notification_contact"
    default = ""
    verbose_name = _("Contact for notification if a person changes their data")
    required = False
    @site_preferences_registry.register
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment