Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Untis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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-App-Untis
Commits
0ded4e82
Commit
0ded4e82
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'prepare-release-2.1' into 'master'
Prepare release 2.1 See merge request
!114
parents
88e5e251
dd9d4a42
No related branches found
No related tags found
1 merge request
!114
Prepare release 2.1
Pipeline
#49881
passed
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: deploy
Pipeline: AlekSIS
#49889
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
CHANGELOG.rst
+4
-0
4 additions, 0 deletions
CHANGELOG.rst
README.rst
+1
-1
1 addition, 1 deletion
README.rst
aleksis/apps/untis/apps.py
+1
-1
1 addition, 1 deletion
aleksis/apps/untis/apps.py
docs/conf.py
+2
-2
2 additions, 2 deletions
docs/conf.py
pyproject.toml
+4
-4
4 additions, 4 deletions
pyproject.toml
with
12 additions
and
8 deletions
CHANGELOG.rst
+
4
−
0
View file @
0ded4e82
...
...
@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
`2.1`_ - 2022-01-13
-------------------
Added
~~~~~
...
...
@@ -148,3 +151,4 @@ Fixed
.. _2.0rc2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0rc2
.. _2.0rc3: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0rc3
.. _2.0: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0
.. _2.1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.1
This diff is collapsed.
Click to expand it.
README.rst
+
1
−
1
View file @
0ded4e82
...
...
@@ -32,7 +32,7 @@ Licence
Copyright © 2018, 2019, 2020, 2021 Jonathan Weth <dev@jonathanweth.de>
Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de>
Copyright © 2019, 2020 Dominik George <dominik.george@teckids.org>
Copyright © 2019, 2020
, 2021
Dominik George <dominik.george@teckids.org>
Copyright © 2019, 2020 Tom Teichler <tom.teichler@teckids.org>
Copyright © 2019 Julian Leucker <leuckeju@katharineum.de>
Copyright © 2019 mirabilos <thorsten.glaser@teckids.org>
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/untis/apps.py
+
1
−
1
View file @
0ded4e82
...
...
@@ -12,7 +12,7 @@ class UntisConfig(AppConfig):
copyright_info
=
(
([
2018
,
2019
,
2020
,
2021
],
"
Jonathan Weth
"
,
"
dev@jonathanweth.de
"
),
([
2018
,
2019
],
"
Frank Poetzsch-Heffter
"
,
"
p-h@katharineum.de
"
),
([
2019
,
2020
],
"
Dominik George
"
,
"
dominik.george@teckids.org
"
),
([
2019
,
2020
,
2021
],
"
Dominik George
"
,
"
dominik.george@teckids.org
"
),
([
2019
,
2020
],
"
Tom Teichler
"
,
"
tom.teichler@teckids.org
"
),
([
2019
],
"
Julian Leucker
"
,
"
leuckeju@katharineum.de
"
),
([
2019
],
"
mirabilos
"
,
"
thorsten.glaser@teckids.org
"
),
...
...
This diff is collapsed.
Click to expand it.
docs/conf.py
+
2
−
2
View file @
0ded4e82
...
...
@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team"
author
=
"
The AlekSIS Team
"
# The short X.Y version
version
=
"
2.
2
"
version
=
"
2.
1
"
# The full version, including alpha/beta/rc tags
release
=
"
2.
2
.1.dev0
"
release
=
"
2.
1
.1.dev0
"
# -- General configuration ---------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
+
4
−
4
View file @
0ded4e82
[tool.poetry]
name
=
"AlekSIS-App-Untis"
version
=
"2.1.dev0"
version
=
"2.1.
1.
dev0"
packages
=
[
{
include
=
"aleksis"
}
]
...
...
@@ -23,7 +23,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Untis"
documentation
=
"https://aleksis.org/AlekSIS/docs/html/"
keywords
=
[
"SIS"
,
"education"
,
"school"
,
"timetable"
,
"plans"
]
classifiers
=
[
"Development Status ::
4
-
Beta
"
,
"Development Status ::
5
-
Production/Stable
"
,
"Environment :: Web Environment"
,
"Framework :: Django :: 3.0"
,
"Intended Audience :: Education"
,
...
...
@@ -41,8 +41,8 @@ python = "^3.9"
mysqlclient
=
"^2.0.0"
tqdm
=
"^4.44.1"
defusedxml
=
"^0.7.0"
aleksis-core
=
"^2.0
rc
"
aleksis-app-chronos
=
"^2.0
rc
"
aleksis-core
=
"^2.0"
aleksis-app-chronos
=
"^2.0"
[tool.poetry.dev-dependencies]
aleksis-builddeps
=
"^6"
...
...
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