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

Merge branch 'release-2.3' into 'master'

Do release 2.3

See merge request !148
parents 329b3363 39db4058
No related branches found
No related tags found
1 merge request!148Do release 2.3
Pipeline #76272 failed
...@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_. ...@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_.
Unreleased Unreleased
---------- ----------
`2.3`_ - 2022-06-25
-------------------
Added Added
~~~~~ ~~~~~
...@@ -220,3 +223,5 @@ Fixed ...@@ -220,3 +223,5 @@ Fixed
.. _2.1.1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.1 .. _2.1.1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.1
.. _2.1.2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.2 .. _2.1.2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.2
.. _2.1.3: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.3 .. _2.1.3: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1.3
.. _2.2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.2
.. _2.3: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.3
...@@ -31,7 +31,7 @@ Licence ...@@ -31,7 +31,7 @@ Licence
:: ::
Copyright © 2018, 2019, 2020, 2021 Jonathan Weth <dev@jonathanweth.de> Copyright © 2018, 2019, 2020, 2021, 2022 Jonathan Weth <dev@jonathanweth.de>
Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de> Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de>
Copyright © 2019, 2020, 2021, 2022 Dominik George <dominik.george@teckids.org> Copyright © 2019, 2020, 2021, 2022 Dominik George <dominik.george@teckids.org>
Copyright © 2019, 2020 Tom Teichler <tom.teichler@teckids.org> Copyright © 2019, 2020 Tom Teichler <tom.teichler@teckids.org>
......
...@@ -10,7 +10,7 @@ class UntisConfig(AppConfig): ...@@ -10,7 +10,7 @@ class UntisConfig(AppConfig):
} }
licence = "EUPL-1.2+" licence = "EUPL-1.2+"
copyright_info = ( copyright_info = (
([2018, 2019, 2020, 2021], "Jonathan Weth", "dev@jonathanweth.de"), ([2018, 2019, 2020, 2021, 2022], "Jonathan Weth", "dev@jonathanweth.de"),
([2018, 2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"), ([2018, 2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"),
([2019, 2020, 2021, 2022], "Dominik George", "dominik.george@teckids.org"), ([2019, 2020, 2021, 2022], "Dominik George", "dominik.george@teckids.org"),
([2019, 2020], "Tom Teichler", "tom.teichler@teckids.org"), ([2019, 2020], "Tom Teichler", "tom.teichler@teckids.org"),
......
...@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team" ...@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team"
author = "The AlekSIS Team" author = "The AlekSIS Team"
# The short X.Y version # The short X.Y version
version = "2.2" version = "2.3"
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = "2.2.1.dev0" release = "2.3.1.dev0"
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-Untis" name = "AlekSIS-App-Untis"
version = "2.2.1.dev0" version = "2.3.1.dev0"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
...@@ -42,7 +42,7 @@ mysqlclient = "^2.0.0" ...@@ -42,7 +42,7 @@ mysqlclient = "^2.0.0"
tqdm = "^4.44.1" tqdm = "^4.44.1"
defusedxml = "^0.7.0" defusedxml = "^0.7.0"
aleksis-core = "^2.8" aleksis-core = "^2.8"
aleksis-app-chronos = "^2.3" aleksis-app-chronos = "^2.4"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "*" aleksis-builddeps = "*"
......
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