Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge down hotfixes into unstable #4245

Merged
merged 91 commits into from
Jul 27, 2023

Conversation

bjester
Copy link
Member

@bjester bjester commented Jul 25, 2023

Summary

Description of the change(s) you made

We hadn't yet merged down hotfixes into unstable. This PR merges it down. The only merge conflict dealt with resolving package upgrades in unstable and a new package from hotfixes within package.json

bjester and others added 30 commits May 10, 2023 13:35
Handle side-loading node data from separate APIs
…nnels_catch_all_errors

Catch any and all errors in exporting channels.
…hanges

Display sync changes in channel edit toolbar
Prevent options being a string rather than JSON
Update aggregate counts when adding, updating, copying, or moving nodes
…t-folder-order

Fixes incorrect folder order/layout for folders with long titles
bjester and others added 23 commits July 7, 2023 10:38
'#'=0
'$'=7983
'*'=(  )
-=569JNRXghikls
'?'=127
@=(  )
ARGC=0
EPOCHREALTIME
EPOCHSECONDS
HISTCMD=5996
LINENO=24
PPID=76126
TTYIDLE=0
ZSH_EVAL_CONTEXT=toplevel:cmdsubst
ZSH_SUBSHELL=1
builtins
dis_builtins
dis_functions_source
dis_patchars
dis_reswords
epochtime
funcfiletrace
funcsourcetrace
funcstack
functions_source
functrace
history
historywords
jobdirs
jobstates
jobtexts
modules
parameters
patchars
reswords
status=127
terminfo
userdirs
usergroups
zsh_eval_context=( toplevel cmdsubst )
…edits

Prevent source edits for copied/imported resources
…pi-export

Remove public API export from 'deploy-migrate'
…7.05-patches/1

Misc smaller patch release fixes for v2023.07.05
…7.05-patches/2

Close nav drawer when clicking to change language
…abot/pip/grpcio-1.53.0

Bump grpcio from 1.51.1 to 1.53.0
Fix to ignore language settings for kolibri public APIs
Throw a value error similarly to if the channel root node is incomplete.
Fix bitmask filtering by multiple labels for AND rather than OR
Prevent errors when creating already existing tag through model entries.
@bjester bjester merged commit 212b46b into learningequality:unstable Jul 27, 2023
@bjester bjester mentioned this pull request Sep 27, 2023
@akolson akolson mentioned this pull request Aug 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants