Merge branch 'do-release-2.0' into 'master'

Do release 2.0

See merge request !28

.gitignore

@@ -58,3 +58,5 @@ docs/_build/
 .tox
 .coverage
 htmlcov/
+
+poetry.lock

.gitlab-ci.yml

 include:
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/general.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/prepare/lock.yml
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/test/lint.yml
     - project: "AlekSIS/official/AlekSIS"

CHANGELOG.rst

@@ -9,11 +9,24 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+`2.0`_ - 2021-12-27
+-------------------
+
+Nothing changed.
+
+`2.0b1`_ - 2021-11-07
+---------------------
+
 Added
 ~~~~~
 
 * Provide API view for accessing the current PDF file of a live document (secured with OAuth2).
 
+Changed
+~~~~~~~
+
+* German translations were updated.
+
 `2.0b0`_ - 2021-11-03
 --------------------
 
@@ -30,3 +43,5 @@ Added
 .. _Semantic Versioning: https://semver.org/spec/v2.0.0.html
 
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b0
+.. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b1
+.. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0

README.rst

@@ -38,6 +38,6 @@ AlekSIS® is a registered trademark of the AlekSIS open source project, represen
 by Teckids e.V. Please refer to the `trademark policy`_ for hints on using the trademark
 AlekSIS®.
 
-.. _AlekSIS: https://edugit.org/AlekSIS/official/AlekSIS
+.. _AlekSIS®: https://edugit.org/AlekSIS/official/AlekSIS
 .. _European Union Public Licence: https://eupl.eu/
 .. _trademark policy: https://aleksis.org/pages/about

aleksis/apps/resint/menus.py

@@ -39,7 +39,10 @@ MENUS = {
             "icon": "open_in_browser",
             "root": True,
             "validators": [
-                ("aleksis.core.util.predicates.permission_validator", "resint.view_poster_menu",),
+                (
+                    "aleksis.core.util.predicates.permission_validator",
+                    "resint.view_poster_menu",
+                ),
             ],
             "submenu": [
                 {

aleksis/apps/resint/migrations/0007_current_file_not_null.py

+# Generated by Django 3.2.9 on 2021-12-29 23:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('resint', '0006_livedocument'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='livedocument',
+            name='current_file',
+            field=models.FileField(blank=True, default='', editable=False, upload_to='live_documents/', verbose_name='Current file'),
+            preserve_default=False,
+        ),
+    ]

aleksis/apps/resint/models.py

@@ -159,7 +159,6 @@ class LiveDocument(ExtensiblePolymorphicModel):
 
     current_file = models.FileField(
         upload_to="live_documents/",
-        null=True,
         blank=True,
         verbose_name=_("Current file"),
         editable=False,

aleksis/apps/resint/urls.py

@@ -34,14 +34,20 @@ urlpatterns = [
         LiveDocumentCreateView.as_view(),
         name="create_live_document",
     ),
-    path("live/<int:pk>/edit/", LiveDocumentEditView.as_view(), name="edit_live_document",),
+    path(
+        "live/<int:pk>/edit/",
+        LiveDocumentEditView.as_view(),
+        name="edit_live_document",
+    ),
     path(
         "live_documents/<int:pk>/delete/",
         LiveDocumentDeleteView.as_view(),
         name="delete_live_document",
     ),
     path(
-        "live_documents/<str:slug>.pdf", LiveDocumentShowView.as_view(), name="show_live_document",
+        "live_documents/<str:slug>.pdf",
+        LiveDocumentShowView.as_view(),
+        name="show_live_document",
     ),
     path(
         "api/live_documents/<str:slug>.pdf",

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Resint"
-version = "2.0b0"
+version = "2.0.1.dev0"
 packages = [
     { include = "aleksis" }
 ]
@@ -21,7 +21,7 @@ license = "EUPL-1.2-or-later"
 homepage = "https://aleksis.org/"
 repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Resint"
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
     "Intended Audience :: Education",
     "Topic :: Education"