Merge release-v0.17.x into develop

### Conflicts:
kolibri/__init__.py

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 List of the most important changes for each release.
 
+## 0.17.2
+
+### Changed
+- Make 'save to device' file downloads initiate immediately by @rtibbles in [#12675](https://github.com/learningequality/kolibri/pull/12675)
+
+
+## 0.17.1
+
+### Added
+- Allow redirects for file downloads by @rtibbles in [#12309](https://github.com/learningequality/kolibri/pull/12309)
+- Add configuration option to disable Zeroconf by @ozer550 in [#12620](https://github.com/learningequality/kolibri/pull/12620)
+
+
+### Changed
+- Optimise Library page load time when channels have large thumbnails by @thesujai in [#12530](https://github.com/learningequality/kolibri/pull/12530)
+- Provide more helpful error state when trying to import from unprovisioned device during device setup by @nucleogenesis in [#12397](https://github.com/learningequality/kolibri/pull/12397)
+- Upgrade Python dependencies by @rtibbles in [#12165](https://github.com/learningequality/kolibri/pull/12165)
+
+### Fixed
+- Preserve the subfolder structure inside the static folder on unzipping for h5p and HTML5 zips by @rtibbles in [#12538](https://github.com/learningequality/kolibri/pull/12538)
+- Fixed variety of inconsistencies with activity notifications by @AlexVelezLl in [#12386](https://github.com/learningequality/kolibri/pull/12386)
+- Fixed mismatch between coach Reports and generated CSV by @AlexVelezLl in [#12628](https://github.com/learningequality/kolibri/pull/12628)
+
+
 ## 0.17.0
 
 ### Added

docs/backend_architecture/upgrade.rst

@@ -14,11 +14,7 @@ these migrations can be generated by executing ``kolibri manage makemigrations``
 
 This will trigger the Django management command that will inspect the current
 model schema, the current migrations, and generate new migrations to cover any
-discrepancies. For some migrations, manual editing will be required to ensure
-compatibility with Python 2 and 3 - this normally happens for Django Model fields
-that take a ``choices`` keyword argument, where the choices are strings. The
-strings should have no prefix (``u`` or ``b``) and the migration should contain
-``from __future__ import unicode_literals`` as an import.
+discrepancies.
 
 For any migrations involving Foreign keys to the FacilityUser model, the migration
 will automatically be generated by Django to use a swappable dependency on settings.AUTH_USER_MODEL.

kolibri/core/analytics/constants/nutrition_endpoints.py

@@ -2,7 +2,7 @@
 This module contains constants which represent what nutrition fact endpoints
 notifications are returned from.
 """
-from __future__ import unicode_literals
+
 
 PINGBACK = "pingback"
 STATISTICS = "statistics"

kolibri/core/analytics/middleware.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import csv
 import logging
 import os

kolibri/core/analytics/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.15 on 2019-01-18 17:18
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations
 from django.db import models

kolibri/core/analytics/models.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models
 
 from .constants import nutrition_endpoints

kolibri/core/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import os
 

kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue

@@ -53,13 +53,17 @@
       fileOptions() {
         const options = this.files.map(file => {
           const label = getFilePresetString(file);
+          const fileId =
+            file.preset === 'video_subtitle' && file?.lang.lang_name
+              ? file?.lang.lang_name
+              : file.checksum.slice(0, 6);
           return {
             label,
             url: file.storage_url,
             fileName: this.$tr('downloadFilename', {
               resourceTitle: this.nodeTitle.length ? this.nodeTitle : file.checksum,
               fileExtension: file.extension,
-              fileId: file.checksum.slice(0, 6),
+              fileId,
             }),
           };
         });
@@ -68,26 +72,12 @@
     },
     methods: {
       download(file) {
-        const req = new XMLHttpRequest();
-        req.open('GET', file.url, true);
-        req.responseType = 'blob';
-
-        req.onload = function () {
-          const blob = req.response;
-          const blobUrl = window.URL.createObjectURL(blob);
-          try {
-            const a = document.createElement('a');
-            a.download = file.fileName;
-            a.href = blobUrl;
-            document.body.appendChild(a);
-            a.click();
-            a.remove();
-          } catch (e) {
-            window.open(file.url, '_blank');
-          }
-        };
-
-        req.send();
+        const a = document.createElement('a');
+        a.download = file.fileName;
+        a.href = file.url;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
       },
     },
     $trs: {

kolibri/core/auth/constants/collection_kinds.py

@@ -1,7 +1,7 @@
 """
 This module contains constants representing the kinds of Collections.
 """
-from __future__ import unicode_literals
+
 
 FACILITY = "facility"
 CLASSROOM = "classroom"

kolibri/core/auth/constants/demographics.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import ValidationError
 from django.utils.deconstruct import deconstructible
 

kolibri/core/auth/constants/facility_presets.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import io
 import json
 import os

kolibri/core/auth/constants/morango_sync.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from kolibri import __version__
 from kolibri.utils import conf
 

kolibri/core/auth/constants/role_kinds.py

@@ -1,7 +1,7 @@
 """
 This module contains constants representing the kinds of "roles" that a user can have with respect to a Collection.
 """
-from __future__ import unicode_literals
+
 
 ADMIN = "admin"
 COACH = "coach"

kolibri/core/auth/csv_utils.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import csv
 import logging
 import os

kolibri/core/auth/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-05-14 05:22
-from __future__ import unicode_literals
-
 import uuid
 
 import django.core.validators

kolibri/core/auth/migrations/0002_auto_20170608_2125.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-06-08 21:25
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0003_auto_20170621_0958.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-06-21 16:58
-from __future__ import unicode_literals
-
 from functools import partial
 
 from django.db import migrations

kolibri/core/auth/migrations/0004_auto_20170816_1607.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-08-16 23:07
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 from kolibri.core.auth.constants.role_kinds import ADMIN

kolibri/core/auth/migrations/0005_auto_20170818_1203.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-08-18 19:03
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations
 from django.db import models

kolibri/core/auth/migrations/0006_auto_20171206_1207.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2017-12-06 20:07
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations
 from django.db import models

kolibri/core/auth/migrations/0007_auto_20171226_1125.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.13 on 2017-12-26 19:25
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0008_auto_20180222_1244.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.13 on 2018-02-22 20:44
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.auth.models

kolibri/core/auth/migrations/0009_auto_20180301_1123.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-03-01 19:23
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations

kolibri/core/auth/migrations/0010_auto_20180320_1320.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-03-20 20:20
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0011_facilitydataset_show_download_button_in_learn.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-03-23 23:56
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0012_facilitydataset_allow_guest_access.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.13 on 2018-07-24 17:48
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0013_auto_20180917_1213.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.15 on 2018-09-17 16:13
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations
 from django.db import models

kolibri/core/auth/migrations/0014_auto_20190815_1421.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.22 on 2019-08-15 21:21
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0015_facilitydataset_registered.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-11-05 17:13
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0016_add_adhoclearnersgroup_collection_kind.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-12-09 12:34
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0017_remove_facilitydataset_allow_guest_access.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-12-03 18:17
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

kolibri/core/auth/migrations/0018_no_i18n_collection_kinds.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2020-06-22 15:50
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0019_collection_no_mptt.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2021-05-01 16:46
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.db import migrations
 from django.db import models

kolibri/core/auth/migrations/0020_facilitydataset_extra_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2022-07-25 09:14
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.fields

kolibri/core/auth/migrations/0021_facilitydataset_extra_fields_validations.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2023-01-31 18:19
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.fields

kolibri/core/auth/migrations/0022_facilitydataset_extra_fields_update_pin_to_string.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2023-02-02 21:21
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.fields

kolibri/core/auth/migrations/0023_change_extra_fields_validator.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2023-03-07 20:46
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.fields

kolibri/core/auth/migrations/0024_extend_username_length.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2023-10-17 17:51
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.db import models
 

kolibri/core/auth/migrations/0025_custom_demographic_schema.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2024-03-28 15:34
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.auth.constants.demographics

kolibri/core/auth/migrations/0026_update_language_code_nyn_to_ny.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.29 on 2024-05-10 21:02
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import kolibri.core.auth.constants.demographics

kolibri/core/auth/test/sync_utils.py

@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import json
 import os
 import shutil

kolibri/core/auth/test/test_session_middleware.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.http import HttpRequest
 from django.http import HttpResponse
 from django.test import SimpleTestCase