Merge branch 'learningequality:develop' into develop

learningequality · Nov 4, 2024 · 41ac7cf · 41ac7cf
2 parents 43b9c26 + 8246294
commit 41ac7cf
Show file tree

Hide file tree

Showing 16 changed files with 783 additions and 875 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 List of the most important changes for each release.
 
+## 0.17.3
+
+### Changed
+- Improve learn folder contents display by @rtibbles in https://github.com/learningequality/kolibri/pull/12737
+- Update KDS theme token by @AllanOXDi in https://github.com/learningequality/kolibri/pull/12742
+- Final token updates by @marcellamaki in https://github.com/learningequality/kolibri/pull/12754
+
+### Added
+- Add Fulfulde translations by @radinamatic in https://github.com/learningequality/kolibri/pull/12738
+- Update morango for conditional indexes on store to improve deserialization performance. by @rtibbles in https://github.com/learningequality/kolibri/pull/12747
+
+### Fixed
+- Settings is not correct after tzlocal update by @jredrejo in https://github.com/learningequality/kolibri/pull/12683
+- Add missing `indeterminate` states on Select All checkboxes by @nucleogenesis in https://github.com/learningequality/kolibri/pull/12587
+- Fix import channel in Postgresql  by @jredrejo in https://github.com/learningequality/kolibri/pull/12709
+- Branding tweaks by @rtibbles in https://github.com/learningequality/kolibri/pull/12736
+- Tweaks to CLI and message extraction utility function by @rtibbles in https://github.com/learningequality/kolibri/pull/12320
+- Delete resource from everywhere when force_delete is selected by @thesujai in https://github.com/learningequality/kolibri/pull/12680
+- Dont delete the entire channel when deleting a single content by @thesujai in https://github.com/learningequality/kolibri/pull/12740
+- Prevent access to undefined AttemptLogs while looking at reports by @LianaHarris360 in https://github.com/learningequality/kolibri/pull/12723
+- Update StorageNotification.vue to prevent undefined access if device plugin is disabled by @rtibbles in https://github.com/learningequality/kolibri/pull/12724
+- Update favicon to be available when the default theme is disabled by @marcellamaki in https://github.com/learningequality/kolibri/pull/12760
+- Fix on my own merge account KCheckbox issue by @AlexVelezLl in https://github.com/learningequality/kolibri/pull/12761
+
 ## 0.17.2
 
 ### Changed

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.7",
-    "kolibri-design-system": "5.0.0-rc7",
+    "kolibri-design-system": "5.0.0-rc8",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.2",

diff --git a/...heme/static/assets/default_theme/logo.ico → kolibri/core/static/assets/favicons/logo.ico b/...heme/static/assets/default_theme/logo.ico → kolibri/core/static/assets/favicons/logo.ico
diff --git a/kolibri/core/templatetags/core_tags.py b/kolibri/core/templatetags/core_tags.py
@@ -65,7 +65,9 @@ def theme_favicon():
 
     # Choose the first available .ico file. It's unlikely there's more than
     # one specified in the theme.
-    favicon_url = favicon_urls[0] if favicon_urls else static("assets/logo.ico")
+    favicon_url = (
+        favicon_urls[0] if favicon_urls else static("assets/favicons/logo.ico")
+    )
 
     return format_html('<link rel="shortcut icon" href="{}">', favicon_url)
 

diff --git a/kolibri/plugins/bloompub_viewer/assets/src/views/BloomPubRendererIndex.vue b/kolibri/plugins/bloompub_viewer/assets/src/views/BloomPubRendererIndex.vue
@@ -8,7 +8,7 @@
   >
     <div
       class="fullscreen-header"
-      :style="{ backgroundColor: $themePalette.grey.v_100 }"
+      :style="{ backgroundColor: $themePalette.grey.v_200 }"
     >
       <KButton
         :primary="false"
@@ -36,7 +36,7 @@
         ref="iframe"
         class="iframe"
         sandbox="allow-scripts allow-same-origin"
-        :style="{ backgroundColor: $themePalette.grey.v_100 }"
+        :style="{ backgroundColor: $themePalette.grey.v_200 }"
         frameBorder="0"
         :src="rooturl"
         allow="fullscreen"

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerHeader.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerHeader.vue
@@ -175,7 +175,7 @@
       boxStyle() {
         return {
           border: '1px solid',
-          borderColor: this.$themePalette.grey.v_100,
+          borderColor: this.$themePalette.grey.v_200,
           borderRadius: '4px',
           padding: '0px 16px',
           margin: '5px',

diff --git a/kolibri/plugins/default_theme/kolibri_plugin.py b/kolibri/plugins/default_theme/kolibri_plugin.py
@@ -23,7 +23,7 @@ def theme(self):
             },
             "logos": [
                 {
-                    "src": static("assets/default_theme/logo.ico"),
+                    "src": static("assets/favicons/logo.ico"),
                     "content_type": "image/vnd.microsoft.icon",
                     "size": "32x32",
                 },

diff --git a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/ConfirmMerge.vue b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/ConfirmMerge.vue
@@ -7,7 +7,7 @@
       <KCheckbox
         ref="kCheckbox"
         :label="$tr('consequences')"
-        :checked="false"
+        :checked="isConfirmed"
         @change="isConfirmed = !isConfirmed"
         @keydown.enter="handleContinue"
       />

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
   },
   "private": true,
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "xhr-mock": "^2.5.1",
     "concurrently": "^8.0.1"
   },

diff --git a/packages/hashi/package.json b/packages/hashi/package.json
@@ -14,7 +14,7 @@
   "license": "MIT",
   "devDependencies": {
     "eslint-plugin-compat": "^6.0.0",
-    "html-webpack-plugin": "5.6.0",
+    "html-webpack-plugin": "5.6.3",
     "jquery": "3.5.1",
     "mutationobserver-shim": "^0.3.7",
     "purgecss": "^6.0.0"

diff --git a/packages/kolibri-common/components/Cards/AccessibleFolderCard.vue b/packages/kolibri-common/components/Cards/AccessibleFolderCard.vue
@@ -14,7 +14,7 @@
       <div class="default-folder-icon">
         <KIcon
           icon="topic"
-          :color="$themePalette.grey.v_600"
+          :color="$themePalette.grey.v_700"
         />
       </div>
     </template>
@@ -31,7 +31,7 @@
         />
         <p
           class="folder-header-text"
-          :style="{ color: $themePalette.grey.v_600 }"
+          :style="{ color: $themePalette.grey.v_700 }"
         >
           {{ coreString('folder') }}
         </p>
@@ -85,7 +85,7 @@
           height: '24px',
           width: '74px',
           margin: '0',
-          backgroundColor: this.$themePalette.grey.v_50,
+          backgroundColor: this.$themePalette.grey.v_100,
         };
       },
     },

diff --git a/packages/kolibri-common/components/Cards/AccessibleResourceCard.vue b/packages/kolibri-common/components/Cards/AccessibleResourceCard.vue
@@ -28,7 +28,7 @@
         <KIconButton
           :icon="isBookmarked ? 'bookmark' : 'bookmarkEmpty'"
           size="mini"
-          :color="$themePalette.grey.v_600"
+          :color="$themePalette.grey.v_700"
           :ariaLabel="coreString('savedFromBookmarks')"
           :tooltip="coreString('savedFromBookmarks')"
           @click.stop="isBookmarked = !isBookmarked"
@@ -37,7 +37,7 @@
         <KIconButton
           icon="infoOutline"
           size="mini"
-          :color="$themePalette.grey.v_600"
+          :color="$themePalette.grey.v_700"
           :ariaLabel="coreString('viewInformation')"
           :tooltip="coreString('viewInformation')"
           @click.stop="$emit('toggleInfo')"

diff --git a/packages/kolibri-common/components/accordion/AccordionContainer.vue b/packages/kolibri-common/components/accordion/AccordionContainer.vue
@@ -6,7 +6,7 @@
       class="header"
       :style="{
         borderColor: $themeTokens.fineLine,
-        backgroundColor: $themePalette.grey.v_50,
+        backgroundColor: $themePalette.grey.v_100,
         ...headerAppearanceOverrides,
       }"
     >

diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
@@ -24,7 +24,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.7",
-    "kolibri-design-system": "5.0.0-rc7",
+    "kolibri-design-system": "5.0.0-rc8",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.2",

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
@@ -14,12 +14,12 @@
     "build-kolibri-tools": "node ./build_kolibri_tools.js"
   },
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-syntax-import-assertions": "^7.25.6",
-    "@babel/plugin-transform-runtime": "^7.25.4",
-    "@babel/preset-env": "^7.25.4",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-syntax-import-assertions": "^7.26.0",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
     "@rushstack/eslint-patch": "^1.10.4",
-    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/jest-dom": "^6.6.2",
     "@testing-library/user-event": "^14.5.2",
     "@testing-library/vue": "^5",
     "@vue/test-utils": "^1.3.6",
@@ -48,7 +48,7 @@
     "eslint-plugin-jest-dom": "^5.4.0",
     "eslint-plugin-kolibri": "0.16.1-dev.1",
     "eslint-plugin-vue": "^9.28.0",
-    "espree": "10.1.0",
+    "espree": "10.3.0",
     "esquery": "^1.6.0",
     "express": "^4.21.0",
     "fast-glob": "^3.3.2",
@@ -73,7 +73,7 @@
     "recast": "^0.23.9",
     "rewire": "^6.0.0",
     "rtlcss": "4.3.0",
-    "sass-loader": "16.0.1",
+    "sass-loader": "16.0.2",
     "scss-parser": "^1.0.6",
     "semver": "^7.6.3",
     "strip-ansi": "6.0.1",