Skip to content

Commit

Permalink
Merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexVelezLl committed Nov 7, 2024
2 parents 63d9b1d + 9e119ca commit e1dfbf4
Show file tree
Hide file tree
Showing 47 changed files with 1,234 additions and 1,214 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions kolibri/core/assets/src/core-app/apiSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ import Draggable from '../views/sortable/Draggable';
import DragHandle from '../views/sortable/DragHandle';
import DragContainer from '../views/sortable/DragContainer';
import DragSortWidget from '../views/sortable/DragSortWidget';
import FocusTrap from '../views/FocusTrap';
import BottomAppBar from '../views/BottomAppBar';
import BaseToolbar from '../views/BaseToolbar';
import GenderSelect from '../views/userAccounts/GenderSelect';
Expand Down Expand Up @@ -169,7 +168,6 @@ export default {
DragHandle,
DragContainer,
DragSortWidget,
FocusTrap,
BottomAppBar,
BaseToolbar,
GenderSelect,
Expand Down
8 changes: 2 additions & 6 deletions kolibri/core/assets/src/views/CoreMenu/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<slot name="header"></slot>
</div>

<FocusTrap
<KFocusTrap
ref="focusTrap"
class="ui-menu-options"
:disabled="!containFocus"
@shouldFocusFirstEl="$emit('shouldFocusFirstEl')"
@shouldFocusLastEl="focusLastEl"
>
<slot name="options"></slot>
</FocusTrap>
</KFocusTrap>

<div
v-if="$slots.footer"
Expand All @@ -42,13 +42,9 @@
<script>
import last from 'lodash/last';
import FocusTrap from 'kolibri.coreVue.components.FocusTrap';
export default {
name: 'CoreMenu',
components: {
FocusTrap,
},
props: {
// Whether to show if links are currently active
showActive: {
Expand Down
78 changes: 0 additions & 78 deletions kolibri/core/assets/src/views/FocusTrap.vue

This file was deleted.

6 changes: 2 additions & 4 deletions kolibri/core/assets/src/views/SideNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
backgroundColor: $themeTokens.surface,
}"
>
<FocusTrap
<KFocusTrap
@shouldFocusFirstEl="$emit('shouldFocusFirstEl')"
@shouldFocusLastEl="focusLastEl"
>
Expand Down Expand Up @@ -214,7 +214,7 @@
:style="{ color: $themeTokens.text }"
>{{ sideNavTitleText }}</span>
</div>
</FocusTrap>
</KFocusTrap>
</div>
</transition>

Expand Down Expand Up @@ -269,7 +269,6 @@
import TotalPoints from './TotalPoints.vue';
import SyncStatusDisplay from './SyncStatusDisplay';
import SideNavDivider from './SideNavDivider';
import FocusTrap from './FocusTrap.vue';
import BottomNavigationBar from './BottomNavigationBar';
// Explicit ordered list of roles for nav item sorting
Expand All @@ -293,7 +292,6 @@
SyncStatusDisplay,
SideNavDivider,
PrivacyInfoModal,
FocusTrap,
TotalPoints,
LanguageSwitcherModal,
BottomNavigationBar,
Expand Down
58 changes: 0 additions & 58 deletions kolibri/core/assets/src/views/__tests__/FocusTrap.spec.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>

<FocusTrap
<KFocusTrap
@shouldFocusFirstEl="focusFirstEl"
@shouldFocusLastEl="focusLastEl"
>
Expand Down Expand Up @@ -36,7 +36,7 @@
</KRadioButtonGroup>
</KGrid>
</KModal>
</FocusTrap>
</KFocusTrap>

</template>

Expand All @@ -46,12 +46,10 @@
import { currentLanguage } from 'kolibri.utils.i18n';
import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import FocusTrap from 'kolibri.coreVue.components.FocusTrap';
import languageSwitcherMixin from './mixin';
export default {
name: 'LanguageSwitcherModal',
components: { FocusTrap },
mixins: [commonCoreStrings, languageSwitcherMixin],
setup() {
const { windowIsSmall } = useKResponsiveWindow();
Expand Down
Loading

0 comments on commit e1dfbf4

Please sign in to comment.