Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Official
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
unscinKibdzu
Official
Commits
175e97fc
Commit
175e97fc
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'prepare-release-2.0rc2' into 'release/2.0'
Prepare release 2.0rc2 See merge request
!194
parents
053fedbd
6dc9e7d1
No related branches found
Branches containing commit
Tags
2.0rc2
Tags containing commit
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.rst
+9
-0
9 additions, 0 deletions
CHANGELOG.rst
aleksis/apps/chronos/rules.py
+1
-1
1 addition, 1 deletion
aleksis/apps/chronos/rules.py
poetry.lock
+276
-275
276 additions, 275 deletions
poetry.lock
pyproject.toml
+1
-1
1 addition, 1 deletion
pyproject.toml
with
287 additions
and
277 deletions
CHANGELOG.rst
+
9
−
0
View file @
175e97fc
...
...
@@ -6,6 +6,14 @@ 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`_.
`2.0rc2`_ - 2021-08-01
----------
Fixed
~~~~~
* Drop usage of non-existing permission in permission rules for lesson substitutions.
`2.0rc1`_ - 2021-06-23
----------------------
...
...
@@ -187,3 +195,4 @@ Fixed
.. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2
.. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3
.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1
.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc2
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/rules.py
+
1
−
1
View file @
175e97fc
...
...
@@ -44,7 +44,7 @@ add_perm("chronos.delete_substitution_rule", delete_substitution_predicate)
# View substitutions
view_substitutions_predicate
=
has_person
&
(
has_global_perm
(
"
chronos.view_lessonsubstitution
"
)
|
has_any_object
(
"
chronos.view_lessonsubstitution
_rule
"
,
LessonSubstitution
)
|
has_any_object
(
"
chronos.view_lessonsubstitution
"
,
LessonSubstitution
)
)
add_perm
(
"
chronos.view_substitutions_rule
"
,
view_substitutions_predicate
)
...
...
This diff is collapsed.
Click to expand it.
poetry.lock
+
276
−
275
View file @
175e97fc
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
1
View file @
175e97fc
[tool.poetry]
name
=
"AlekSIS-App-Chronos"
version
=
"2.0rc
1
"
version
=
"2.0rc
2
"
packages
=
[
{
include
=
"aleksis"
}
]
...
...
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