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 0.14.4-weekly6 into develop #7655

Merged

Conversation

jonboiser
Copy link
Contributor

No description provided.

kollivier and others added 17 commits October 23, 2020 13:47
…wn content, by using the default markdown parser.
…ding-page

Change assignable coach landing page after login
Update markdown parser config to fix issue with broken line breaks handling in resource descriptions
…pub-searchbuttons

Prevent SearchButton components from overlapping in EPUB Renderer
This hopefully helps with removing any deadlocks due to non-expiring locks.
…e-alive

Add 30 second TTL to ProcessLock redis keys
…herkin-coach-create-lesson-filoe

Clarification in lesson creation gherkin
…-form-disable

Disable form on submit for leaner enrollment and coach assignment
# Conflicts:
#	kolibri/plugins/facility/assets/src/views/ClassEnrollForm.vue
#	kolibri/plugins/facility/assets/src/views/CoachClassAssignmentPage.vue
#	kolibri/plugins/facility/assets/src/views/LearnerClassEnrollmentPage.vue
@jonboiser jonboiser added this to the 0.15.0 milestone Nov 2, 2020
@jonboiser jonboiser changed the base branch from release-v0.14.x to develop November 2, 2020 18:04
drf-yasg
drf-yasg==1.17.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 This is needed right now to setup Kolibri for development. Today I went through the getting started guide and got an error on this drf-yasg dependency. I was about to open a PR, glad to find one already.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manuq, were you planning to work on an issue? If, so you will most likely want to be using the release-v0.14.x as your base. Because of how we do our releases, that branch is where we target changes that will fix issues in any milestone like 0.14.4 or 0.14.5

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonboiser ah good to know. I'm doing some research for Endless, no issue in particular. I was following the getting started guide from scratch today, because my git checkout was outdated.

@codecov
Copy link

codecov bot commented Nov 2, 2020

@rtibbles rtibbles merged commit 46aa1a9 into learningequality:develop Nov 2, 2020
@jonboiser jonboiser deleted the 0.14.4-weekly6-into-develop branch November 2, 2020 22:10
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.

None yet

9 participants