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

0.15.x to central-develop #4683

Merged
merged 61 commits into from
Nov 24, 2015
Merged

0.15.x to central-develop #4683

merged 61 commits into from
Nov 24, 2015

Conversation

aronasorman
Copy link
Collaborator

Required in order to update the po files.

benjaoming and others added 30 commits September 7, 2015 15:28
Conflicts:
	kalite/main/api_resources.py
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.
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 language pack availability issue in 0.14.1
Add a note in system_requirements.rst and release_notes.rst.
Avoid unnecessary dependencies for old dbbackup version
Reinstate Khan i18n helpers, overwrite $._ to ensure translation.
MCGallaspy and others added 24 commits October 12, 2015 14:24
Include docs in sdist and add Makefile for common build, dev, test
automatically generate a manpage and put it in docs/
Conflicts:
	data/version.yml
	kalite/main/api_resources.py
	kalite/settings/base.py
	kalite/version.py
Update link -- it slipped past us that it's for 0.14.
Handles three errors.

1. In get_exercise_prereqs, if an unknown exercise id is passed in, it
now contributes nothing to the prereqs instead of raising an error.

2. Avoid a divide-by-zero error in coachreports.models.

3. Finally, in get_explore_recommendations, use of `next` built-in could
result in an unhandled StopIteration exception. Refactor to use for..in block.
The tests select and try to click a zero-area element -- it
doesn't do what's intended, notably load another page.
Instead, the intent is to click one of that element's
children with a non-zero area.
propagate the request language in user progress.
@aronasorman aronasorman self-assigned this Nov 24, 2015
@aronasorman aronasorman added this to the 0.15.1 milestone Nov 24, 2015
aronasorman added a commit that referenced this pull request Nov 24, 2015
@aronasorman aronasorman merged commit dc56afc into central-develop Nov 24, 2015
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.

9 participants