Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Resint
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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-Resint
Compare revisions
887227445b1dd7d7a6f89628331cf4b62cbe24dc to 7af262e77da616ab6187ef6253c848ec561986f8
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
AlekSIS/official/AlekSIS-App-Resint
Select target project
No results found
7af262e77da616ab6187ef6253c848ec561986f8
Select Git revision
Swap
Target
AlekSIS/official/AlekSIS-App-Resint
Select target project
AlekSIS/official/AlekSIS-App-Resint
sunweaver/AlekSIS-App-Resint
2 results
887227445b1dd7d7a6f89628331cf4b62cbe24dc
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (4)
Bump version to 2.2
· 0b8351ef
Jonathan Weth
authored
2 years ago
0b8351ef
Update copyright for 2022
· 88cd85ae
Jonathan Weth
authored
2 years ago
88cd85ae
Bump version to 2.2.1.dev0
· e4931837
Jonathan Weth
authored
2 years ago
e4931837
Merge branch 'release-2.2' into 'master'
· 7af262e7
Nik | Klampfradler
authored
2 years ago
Do release 2.2 See merge request
!50
7af262e7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
CHANGELOG.rst
+4
-0
4 additions, 0 deletions
CHANGELOG.rst
README.rst
+2
-1
2 additions, 1 deletion
README.rst
aleksis/apps/resint/apps.py
+2
-1
2 additions, 1 deletion
aleksis/apps/resint/apps.py
docs/conf.py
+2
-2
2 additions, 2 deletions
docs/conf.py
pyproject.toml
+1
-1
1 addition, 1 deletion
pyproject.toml
with
11 additions
and
5 deletions
CHANGELOG.rst
View file @
7af262e7
...
...
@@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
`2.2`_ - 2022-06-23
-------------------
Added
~~~~~
...
...
@@ -69,3 +72,4 @@ Added
.. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b1
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0
.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1
.. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.2
This diff is collapsed.
Click to expand it.
README.rst
View file @
7af262e7
...
...
@@ -21,8 +21,9 @@ Licence
::
Copyright © 2018, 2019, 2020, 2021 Jonathan Weth <dev@jonathanweth.de>
Copyright © 2020, 2021 Frank Poetzsch-Heffter <p-h@katharineum.de>
Copyright © 2019 Julian Leucker <leuckeju@katharineum.de>
Copyright © 2020, 2021 Frank Poetzsch-Heffter <p-h@katharineum.de>
Copyright © 2022 Dominik George <dominik.george@teckids.org>
Licenced under the EUPL, version 1.2 or later
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/resint/apps.py
View file @
7af262e7
...
...
@@ -16,8 +16,9 @@ class ResintConfig(AppConfig):
licence
=
"
EUPL-1.2+
"
copyright_info
=
(
([
2018
,
2019
,
2020
,
2021
],
"
Jonathan Weth
"
,
"
dev@jonathanweth.de
"
),
([
2020
,
2021
],
"
Frank Poetzsch-Heffter
"
,
"
p-h@katharineum.de
"
),
([
2019
],
"
Julian Leucker
"
,
"
leuckeju@katharineum.de
"
),
([
2020
,
2021
],
"
Frank Poetzsch-Heffter
"
,
"
p-h@katharineum.de
"
),
([
2022
],
"
Dominik George
"
,
"
dominik.george@teckids.org
"
),
)
@classmethod
...
...
This diff is collapsed.
Click to expand it.
docs/conf.py
View file @
7af262e7
...
...
@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team"
author
=
"
The AlekSIS Team
"
# The short X.Y version
version
=
"
2.
1
"
version
=
"
2.
2
"
# The full version, including alpha/beta/rc tags
release
=
"
2.
1
.1.dev0
"
release
=
"
2.
2
.1.dev0
"
# -- General configuration ---------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
View file @
7af262e7
[tool.poetry]
name
=
"AlekSIS-App-Resint"
version
=
"2.
1
.1.dev0"
version
=
"2.
2
.1.dev0"
packages
=
[
{
include
=
"aleksis"
}
]
...
...
This diff is collapsed.
Click to expand it.