Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • hansegucker/AlekSIS-Core
  • pinguin/AlekSIS-Core
  • AlekSIS/official/AlekSIS-Core
  • sunweaver/AlekSIS-Core
  • sggua/AlekSIS-Core
  • edward/AlekSIS-Core
  • magicfelix/AlekSIS-Core
7 results
Show changes
Commits on Source (25)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2296 additions and 2049 deletions
CHANGELOG.rst
View file @ 94923608
......@@ -9,10 +9,20 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Added
~~~~~
* Allow to disable exception mails to admins
Fixed
~~~~~
* The menu button used to be displayed twice on smaller screens.
* The icons were loaded from external servers instead from local server.
* Weekdays were not translated if system locales were missing
* Added locales-all to base image and note to docs
* The icons in the account menu were still the old ones.
* Due to a merge error, the once removed account menu in the sidenav appeared again.
Changed
~~~~~~~
......
Dockerfile
View file @ 94923608
......@@ -36,6 +36,7 @@ RUN apt-get -y update && \
less \
libpq-dev \
libssl-dev \
locales-all \
postgresql-client-14 \
pspg \
python3-dev \
......
aleksis/core/locale/ar/LC_MESSAGES/djangojs.po
View file @ 94923608
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-08 23:16+0000\n"
"POT-Creation-Date: 2022-03-23 11:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -30,6 +30,6 @@ msgstr ""
msgid "OK"
msgstr ""
#: aleksis/core/static/js/main.js:191
#: aleksis/core/static/js/main.js:195
msgid "This page may contain outdated information since there is no internet connection."
msgstr ""
aleksis/core/locale/de_DE/LC_MESSAGES/djangojs.po
View file @ 94923608
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-08 23:16+0000\n"
"POT-Creation-Date: 2022-03-23 11:20+0100\n"
"PO-Revision-Date: 2021-10-28 14:37+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-core-js/de/>\n"
......@@ -30,6 +30,6 @@ msgstr "Abbrechen"
msgid "OK"
msgstr "OK"
#: aleksis/core/static/js/main.js:191
#: aleksis/core/static/js/main.js:195
msgid "This page may contain outdated information since there is no internet connection."
msgstr "Diese Seite enthält vielleicht veraltete Informationen, da es keine Internetverbindung gibt."
aleksis/core/locale/fr/LC_MESSAGES/djangojs.po
View file @ 94923608
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-08 23:16+0000\n"
"POT-Creation-Date: 2022-03-23 11:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -30,6 +30,6 @@ msgstr ""
msgid "OK"
msgstr ""
#: aleksis/core/static/js/main.js:191
#: aleksis/core/static/js/main.js:195
msgid "This page may contain outdated information since there is no internet connection."
msgstr ""
aleksis/core/locale/la/LC_MESSAGES/djangojs.po
View file @ 94923608
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-08 23:16+0000\n"
"POT-Creation-Date: 2022-03-23 11:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
msgid "OK"
msgstr ""
#: aleksis/core/static/js/main.js:191
#: aleksis/core/static/js/main.js:195
msgid "This page may contain outdated information since there is no internet connection."
msgstr ""
aleksis/core/locale/nb_NO/LC_MESSAGES/djangojs.po
View file @ 94923608
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-08 23:16+0000\n"
"POT-Creation-Date: 2022-03-23 11:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
msgid "OK"
msgstr ""
#: aleksis/core/static/js/main.js:191
#: aleksis/core/static/js/main.js:195
msgid "This page may contain outdated information since there is no internet connection."
msgstr ""
aleksis/core/locale/tr_TR/LC_MESSAGES/djangojs.po
View file @ 94923608
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-08 23:16+0000\n"
"POT-Creation-Date: 2022-03-23 11:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -29,6 +29,6 @@ msgstr ""
msgid "OK"
msgstr ""
#: aleksis/core/static/js/main.js:191
#: aleksis/core/static/js/main.js:195
msgid "This page may contain outdated information since there is no internet connection."
msgstr ""
aleksis/core/menus.py
View file @ 94923608
This diff is collapsed.
aleksis/core/settings.py
View file @ 94923608
import os
import warnings
from copy import deepcopy
from glob import glob
from socket import getfqdn
from django.utils.log import DEFAULT_LOGGING
from django.utils.translation import gettext_lazy as _
from dynaconf import LazySettings
......@@ -870,21 +872,22 @@ BLEACH_STRIP_TAGS = True
# Strip comments, or leave them in.
BLEACH_STRIP_COMMENTS = True
LOGGING = {
"version": 1,
"disable_existing_loggers": False,
"handlers": {
"console": {"class": "logging.StreamHandler", "formatter": "verbose"},
"null": {"class": "logging.NullHandler"},
},
"formatters": {"verbose": {"format": "%(levelname)s %(asctime)s %(module)s: %(message)s"}},
"root": {
"handlers": ["console"],
"level": _settings.get("logging.level", "WARNING"),
},
"loggers": {},
LOGGING = deepcopy(DEFAULT_LOGGING)
# Set root logging level as default
LOGGING["root"] = {
"handlers": ["console"],
"level": _settings.get("logging.level", "WARNING"),
}
# Add null handler for selective silencing
LOGGING["handlers"]["null"] = {"class": "logging.NullHandler"}
# Make console logging independent of DEBUG
LOGGING["handlers"]["console"]["filters"].remove("require_debug_true")
# Use root log level for console
del LOGGING["handlers"]["console"]["level"]
# Disable exception mails if not desired
if not _settings.get("logging.mail_admins", True):
LOGGING["loggers"]["django"]["handlers"].remove("mail_admins")
# Disable mails on disaalowed host by default
if not _settings.get("logging.disallowed_host", False):
LOGGING["loggers"]["django.security.DisallowedHost"] = {
"handlers": ["null"],
......
aleksis/core/static/public/style.scss
View file @ 94923608
......@@ -850,15 +850,15 @@ $person-logo-size: 20vh;
}
}
i.material-icons.new-notification {
a.new-notification {
position: relative;
&:after {
content: "";
position: absolute;
width: 12px;
height: 12px;
bottom: 27%;
right: -4%;
width: 10px;
height: 10px;
bottom: 30%;
right: 19%;
background-color: $secondary-color;
border-radius: 50%;
}
......
aleksis/core/templates/core/base.html
View file @ 94923608
This diff is collapsed.
docs/admin/10_install.rst
View file @ 94923608
This diff is collapsed.
pyproject.toml
View file @ 94923608
This diff is collapsed.