Master into 0.15.x#4621
Merged
benjaoming merged 19 commits intolearningequality:0.15.xfrom Oct 13, 2015
Merged
Conversation
Fix learningequality#4382 -- we are MIT licensed
Conflicts: kalite/main/api_resources.py
…m_translate_0.14.x Actually translate assessment item data.
Add warning to langauge pack download completion to restart server.
Raspbian uses an old distribution of wget resulting in a certificate error upon attempting the download as documented in the installation guidelines. Including the "--no-check-certificate" parameter fixes this issue.
Update install_all.rst
Generate a secret key file, and load SECRET_KEY from said file.
The central server sends a short version (e.g. 0.14), which the distributed server then compares to its long version (e.g. 0.14.1). The problem is that 0.14 compares as less than 0.14.1, so language packs are shown as unavailable. Instead, when comparing two mismatched-length versions, only consider the shortest version available -- thus 0.14 and 0.14.1 would compare equal. Then the languagepack versions will be compared, which is the actual intent.
…-fix Fix language pack availability issue in 0.14.1
Conflicts: data/version.yml kalite/main/api_resources.py kalite/settings/base.py kalite/version.py
kalite/settings/base.py
Outdated
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Merged
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
My suggestions for resolving merge conflicts.