Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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-Core
Commits
032a3cac
Commit
032a3cac
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'prepare-release-2.2' into 'master'
Prepare release 2.2 See merge request
!793
parents
f93bdf98
16a28acd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!793
Prepare release 2.2
Pipeline
#42688
passed
3 years ago
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
4
Pipelines
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.rst
+8
-2
8 additions, 2 deletions
CHANGELOG.rst
docs/conf.py
+2
-2
2 additions, 2 deletions
docs/conf.py
poetry.lock
+339
-206
339 additions, 206 deletions
poetry.lock
pyproject.toml
+2
-2
2 additions, 2 deletions
pyproject.toml
with
351 additions
and
212 deletions
CHANGELOG.rst
+
8
−
2
View file @
032a3cac
...
...
@@ -6,8 +6,8 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
Unreleased
----------
`2.2`_ - 2021-11-29
----------
---------
Added
~~~~~
...
...
@@ -16,6 +16,11 @@ Added
* Provide views for assigning/managing permissions in frontend
* Support (icon) tabs in the top navbar.
Changed
~~~~~~~
* Update German translations.
Fixed
~~~~~
...
...
@@ -481,3 +486,4 @@ Fixed
.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0
.. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1
.. _2.1.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1.1
.. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.2
This diff is collapsed.
Click to expand it.
docs/conf.py
+
2
−
2
View file @
032a3cac
...
...
@@ -29,9 +29,9 @@ copyright = "2019, 2020, AlekSIS team"
author
=
"
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
"
release
=
"
2.
2
"
# -- General configuration ---------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
poetry.lock
+
339
−
206
View file @
032a3cac
This diff is collapsed.
Click to expand it.
pyproject.toml
+
2
−
2
View file @
032a3cac
[tool.poetry]
name
=
"AlekSIS-Core"
version
=
"2.2
.dev0
"
version
=
"2.2"
packages
=
[
{
include
=
"aleksis"
}
]
...
...
@@ -29,7 +29,7 @@ repository = "https://edugit.org/AlekSIS/official/AlekSIS-Core"
documentation
=
"https://aleksis.org/AlekSIS-Core/docs/html/"
keywords
=
[
"SIS"
,
"education"
,
"school"
,
"digitisation"
,
"school apps"
]
classifiers
=
[
"Development Status ::
4
-
Beta
"
,
"Development Status ::
5
-
Production/Stable
"
,
"Environment :: Web Environment"
,
"Framework :: Django :: 3.0"
,
"Intended Audience :: Developers"
,
...
...
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