0.15.x into central-develop #4513
Merged
Conversation
This file contains 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
Add qtip to global jQuery object; remove redundant setting
Add try-except block for individual screenshots
Add kwarg wait_time to browser_activate_element, use in screenshots
Escape and un-escape spaces in command line argument
Screenshots can be annotated, but whitepspace is stripped from cl arguments.
As a work-around, even earlier we escape the whitespace in an annotation, and
then un-escape it again in the screenshots management command.
The replacement is not literal -- all whitespace (matching r'\s') will be
replaced with a single space (' ').
Clean up screenshot management command & browser mixins
In screenshots.py:
* Add the "shot" to output of snap_all exception handling
* Remove unnecessary logging-in/logging-out functionality
from process_snap. The login endpoint logs out users already.
Not using browser_is_logged_in avoids overhead.
* Unconditionally browse to start url in process_snap.
In the browser mixins:
* Refactor browse_to to not use wait_for_page_change. WebDriver
already waits for the page's onload event.
* Add better error handling to browser_activate_element, by logging kwargs.
Collected named args into kwargs to facilitate error message.
* Add js snippet to browser_send_keys, to ensure a given state.
Escape & unescape more whitespace
Clean up default model cruft in RatingView -- an unspecified model will just default to null. Always use RatingModel.debounced_save instead of explicit save, to ensure saves are made at most once for fast input. In the StarView, separate a save call from display logic and move to appropriate callback. In topics/views.js, don't set an empty default model -- it can now safely be null. In the display logic of show_rating, handle the case when the model is unset, and also queue up a debounced_save before switching out a model.
If a user interacted with the rating and set quality, but never set difficulty, then subsequent loads would cause the filled-in quality to display, but not difficulty. Changed so that difficulty is now also displayed if quality is already set.
Update the OSX documentation.
IE9 Compatibility fix for Nav Bar
Final docs of KA-Lite Monitor installation in OSX.
Use correct name for progress_log.
Minor documentation corrections
…r old video-js version.
Strictly enforce video-js version for srt compatability.
Put cache database in user-writable location
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.
Updated content from KA, via contentload.
Change version comparison logic
Conflicts: kalite/main/api_resources.py Conflicts: kalite/main/api_resources.py
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. Conflicts: docs/installguide/install_all.rst
Conflicts: data/version.yml kalite/version.py
Conflicts: data/version.yml kalite/version.py
Log whenever we fail to load the SQLite content cache.
0.15.x cherry-picks from 0.14.x
|
Let's do this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.