Merge branch 'master' into maintain-default-data

.gitmodules

 [submodule "apps/official/AlekSIS-App-Alsijil"]
 	path = apps/official/AlekSIS-App-Alsijil
-	url = https://edugit.org/AlekSIS/AlekSIS-App-Alsijil
+	url = https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil
 	ignore = untracked
 [submodule "apps/official/AlekSIS-App-Chronos"]
 	path = apps/official/AlekSIS-App-Chronos
-	url = https://edugit.org/AlekSIS/AlekSIS-App-Chronos
+	url = https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos
 	ignore = untracked
 [submodule "apps/official/AlekSIS-App-Exlibris"]
 	path = apps/official/AlekSIS-App-Exlibris
-	url = https://edugit.org/AlekSIS/AlekSIS-App-Exlibris
+	url = https://edugit.org/AlekSIS/Official/AlekSIS-App-Exlibris
 	ignore = untracked
 [submodule "apps/official/AlekSIS-App-DashboardFeeds"]
 	path = apps/official/AlekSIS-App-DashboardFeeds
-	url = https://edugit.org/AlekSIS/AlekSIS-App-DashboardFeeds.git
+	url = https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds.git
 	ignore = untracked

CHANGELOG.rst

@@ -75,7 +75,7 @@ Minor changes
 * Use bootstrap buttons everywhere
 
 
-_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a1
-_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a2
-_`1.0a4`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a4
-_`2.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/2.0a1
+_`1.0a1`: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/1.0a1
+_`1.0a2`: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/1.0a2
+_`1.0a4`: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/1.0a4
+_`2.0a1`: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0a1

README.rst

@@ -50,5 +50,5 @@ full licence text or on the `European Union Public Licence`_ website
 https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers
 (including all other official language versions).
 
-.. _AlekSIS: https://edugit.org/AlekSIS/AlekSIS
+.. _AlekSIS: https://edugit.org/AlekSIS/Official/AlekSIS
 .. _European Union Public Licence: https://eupl.eu/

aleksis/core/locale/de_DE/LC_MESSAGES/django.po

@@ -8,9 +8,10 @@ msgstr ""
 "Project-Id-Version: AlekSIS (School Information System) 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-01 20:19+0000\n"
-"PO-Revision-Date: 2019-09-17 21:08+0000\n"
+"PO-Revision-Date: 2020-01-24 14:49+0000\n"
 "Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
-"Language-Team: German <https://translate.edugit.org/projects/aleksis/biscuit-ng/de/>\n"
+"Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis/"
+"de/>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +57,7 @@ msgstr "Abmelden"
 
 #: aleksis/core/menus.py:35
 msgid "Two factor auth"
-msgstr ""
+msgstr "Zwei-Faktor-Authentifizierung"
 
 #: aleksis/core/menus.py:46
 msgid "Admin"

AlekSIS-App-Alsijil @ 59ff73fc

-Subproject commit 440e6416ca1e45727ab0db64409fbc4f3ca1bf40
+Subproject commit 59ff73fce785808136baa4cf0a82ab921e89688d

AlekSIS-App-Chronos @ d477b2bf

-Subproject commit d9452c08a9ad9d97172bd96f17e58fa54b2715d2
+Subproject commit d477b2bfba9e59753136556149a366dfe892299b

AlekSIS-App-DashboardFeeds @ 98a399ed

-Subproject commit 370226c94f2070368b9a48efbc59beabfc0dd9cf
+Subproject commit 98a399ed8ddcfca0292677fcf6b325b74594e60e

AlekSIS-App-Exlibris @ 68622b9d

-Subproject commit 2749bb79bdf62b975a95e44e1f2eb479b6c9d3a7
+Subproject commit 68622b9d209490c3f1ce230740a148b3e9c23a71

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     image: memcached:latest
   app:
     build: .
-    image: registry.edugit.org/aleksis/aleksis:${ALEKSIS_IMAGE_TAG:-latest}
+    image: registry.edugit.org/aleksis/official/aleksis:${ALEKSIS_IMAGE_TAG:-latest}
     volumes:
       - aleksis_data:/var/lib/aleksis/
     environment:
@@ -25,7 +25,7 @@ services:
       - memcached
   web:
     build: ./docker/nginx
-    image: registry.edugit.org/aleksis/aleksis/nginx:${ALEKSIS_IMAGE_TAG:-latest}
+    image: registry.edugit.org/aleksis/official/aleksis/nginx:${ALEKSIS_IMAGE_TAG:-latest}
     volumes:
       - aleksis_data:/var/lib/aleksis/
     ports:

pyproject.toml

@@ -11,7 +11,7 @@ description = "AlekSIS (School Information System) — Core"
 authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuckeju@katharineum.de>", "mirabilos <thorsten.glaser@teckids.org>", "Frank Poetzsch-Heffter <p-h@katharineum.de>", "Tom Teichler <tom.teichler@teckids.org>", "Jonathan Weth <wethjo@katharineum.de>", "Hangzhi Yu <yuha@katharineum.de>"]
 license = "EUPL-1.2"
 homepage = "https://aleksis.org/"
-repository = "https://edugit.org/AlekSIS/AlekSIS"
+repository = "https://edugit.org/AlekSIS/Official/AlekSIS"
 documentation = "https://aleksis.edugit.io/AlekSIS/docs/html/"
 classifiers = [
     "Environment :: Web Environment",