Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
64fd8354
Commit
64fd8354
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
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
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!916
Resolve "Clearing theme colours breaks SCSS compilation"
Pipeline
#50418
passed
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Pipeline: AlekSIS
#50420
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+1
-0
1 addition, 0 deletions
CHANGELOG.rst
aleksis/core/preferences.py
+4
-6
4 additions, 6 deletions
aleksis/core/preferences.py
with
5 additions
and
6 deletions
CHANGELOG.rst
+
1
−
0
View file @
64fd8354
...
...
@@ -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
-------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/preferences.py
+
4
−
6
View file @
64fd8354
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment