-
Notifications
You must be signed in to change notification settings - Fork 303
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
Prereleases/0.16b2 #4967
Closed
kalitebuilder
wants to merge
593
commits into
learningequality:master
from
kalitebuilder:prereleases/0.16b2
Closed
Prereleases/0.16b2 #4967
kalitebuilder
wants to merge
593
commits into
learningequality:master
from
kalitebuilder:prereleases/0.16b2
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
Make it in line with the new command name.
Avoids memory leaks when called from a long-running server.
download_content_pack has been changed to accept a generic file object, instead of the specific one created by NamedTemporaryFile(). This avoids an error on Windows (see learningequality#4764 (comment)).
…k-download Content pack download v2
If I make these blocking, will it stop the error? Seems to have worked in similar cases: http://trac.edgewall.org/ticket/2066#comment:1
…efile-for-bamboo Modified setup.py for OSX, avoid error on build server
Previously we generated our own dummy metadata. Now, extract the one that comes with the content pack.
fix broken way of detecting video download success
…fix-merge-to-0.16.x tastypie fix merge to 0.16.x.
…rror Prevent TypeErrors getting thrown on partial downloads.
…ngle entry point.
Small tweak to content rec test.
…es from 98c30e8..dcdae8a dcdae8a Merge branch 'master' of github.com:learningequality/khan-exercises c6d1db7 Merge branch 'ka_master' 1070e1b Update the eslint-disable directives. e041278 Fix timestamp on attempt data to work across locales. ed03ce4 Change wording for incorrect answers to be more encouraging 2c1bf12 Don't depend on `KA.getUserID` existing. 8076e90 Properly clean up after a problem when using interfaceFunctions 486f553 Add callbacks for state change in ExerciseProblemTemplate (Bibliotron Execises part 8b) 156610b Check for existence of data object when looking for skipDOMManipulation 7b500fd Expose checkAnswer, skipQuestion, gotoNextProblem, and showHint to webapp (Bibliotron Exercises part 7b) 67d879b Pass a flag to problemTemplateRendered to skip DOM manipulation (Bibliotron Exercises part 5b) 7521aa6 Add imperative `showHint(hintNumber)` function 0eb9b02 Allow clients to interact imperatively w/ interface.js (starting with handleAttempt) f14fc0c Prevent race condition in calculator modules 38e79db Refactored calculator UI code to a separate module 87db7a5 Make sure a string is passed into JSON.parseString 0d566a4 Enable anti-cheating code. f5d0d31 Differentiate between error types when failing to load an exercise. 32eef88 Don't point people to GitHub to report content issues ccbe215 Explicitly require base modules b401c13 Answer major question in README. 29e48f8 Do not assume window.localStorage's presence implies usability eb7d469 Reintroduce offline cheating detection. 78c9279 Merge pull request #161545 from Khan/brownhead-update-readme 2630d00 Add some text to ellipse_intuition to help explain the exercise better. 0a0e86d Cleanup README and make status clearer. 6163e8f Merge pull request #161539 from Christi/patch-1 a189f3a Update division 1.5 to remove 2 digit divisors... 665ac66 Merge pull request #161433 from rhc2104/patch-1 2dcc902 Merge pull request #161495 from mankal111/master ae60143 Add support for two new problem-error types. 792a916 Add missing apostrophe 895f133 Change histogram to dotplot 54c6269 Reword question 7df5e51 Make coordinate plural 85b53ad Update khan-exercises to remove all references to Jed. 95e2c88 Fix $_ in local i18n.js so that Perseus can use it when running locally 3ca2d5e Simplify the local-only script since i18n.js already defines window.i18n. bd4e680 Change from $._ and $.ngettext over to i18n._ and i18n.ngettext. 373c111 Copy over an ES5-compatible version of i18n.js. 8104630 Update the local files, and update the local script as well. a27f4d7 Fix the regexp for arc lint to correctly only match a single line. cf7b219 Add a bunch of eslint-disable comments for legacy code. 4e8bdb3 Add more specific types to fix 2 exercises on mobile 52402da Add processText function. f83f6c0 Temporarily don't detect offline hints. 3a4a070 Revert change to remove mathzoom from khan-exercises c4addc0 Remove MathZoom from kathjax.py, and rebuild MathJax 90a4af4 Send Travis alerts to Slack instead of HipChat 1c6a1f0 Fix rounding whole numbers 6bb8c50 Remove MathZoom.js from MathJax 2fe3d31 Update standard_deviation_of_a_population.html 9a7495c Add MathZoom.js to MathJax for real 3870ebc Add MathZoom.js extension to third_party MathJax. d59065a Change equal sign to approx if MEAN is rounded 8f87810 Limit places to places we have names for 4a37397 Prevent cheating with offline hints. c953f4d Remove ServerActionQueue from interface.js. c2266bd Increase the range of questions a660f4c Remove questions with radians 64001df Don't show related videos in skill checks 0b1d12c Fix lint in build/pack.js again. 7cf3890 Add data-type="text" to points_lines_and_planes for mobile testing. 6b5f477 Fix lint in interface.js 6e6b893 Lint fixes for pack.js script 0f1927e khan-exercises should be usable without KA globals 19994c4 Simplify question and have consistent wording of variation 21c4118 Fix "adding decimals" on iPad 89cb60f Fix comparing_fractions_1 freezing issue again. 576d765 Fix hints 93154c4 Add missing plus sign to equation 02cd36f Remove redundant words (angle) 2fdf1c2 Fix test for point in shaded area 4d272bd Avoid a denominator that imposes impossible constraints 51587a0 Revert "Removing gandalf bridge" e4f1c17 Removing gandalf bridge 054e319 Update copyright on README git-subtree-dir: kalite/distributed/static/js/distributed/perseus/ke git-subtree-split: dcdae8a3760b99e647866ce9a7a0585165feaf86
…and_fonts Conflicts: kalite/distributed/static/js/distributed/perseus/ke/local-only/i18n.js kalite/distributed/static/js/distributed/perseus/ke/utils/algebra-intuition.js kalite/distributed/static/js/distributed/perseus/ke/utils/angles.js kalite/distributed/static/js/distributed/perseus/ke/utils/answer-types.js kalite/distributed/static/js/distributed/perseus/ke/utils/chemistry.js kalite/distributed/static/js/distributed/perseus/ke/utils/cipher.js kalite/distributed/static/js/distributed/perseus/ke/utils/congruency.js kalite/distributed/static/js/distributed/perseus/ke/utils/constructions.js kalite/distributed/static/js/distributed/perseus/ke/utils/convert-values.js kalite/distributed/static/js/distributed/perseus/ke/utils/crc32.js kalite/distributed/static/js/distributed/perseus/ke/utils/derivative-intuition.js kalite/distributed/static/js/distributed/perseus/ke/utils/exponents.js kalite/distributed/static/js/distributed/perseus/ke/utils/expressions.js kalite/distributed/static/js/distributed/perseus/ke/utils/functional.js kalite/distributed/static/js/distributed/perseus/ke/utils/geom.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-3d.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-drawing.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-geometry.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-helpers-arithmetic.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-helpers.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie-polygon.js kalite/distributed/static/js/distributed/perseus/ke/utils/graphie.js kalite/distributed/static/js/distributed/perseus/ke/utils/interactive.js kalite/distributed/static/js/distributed/perseus/ke/utils/jquery.adhesion.js kalite/distributed/static/js/distributed/perseus/ke/utils/khanscript.js kalite/distributed/static/js/distributed/perseus/ke/utils/kline.js kalite/distributed/static/js/distributed/perseus/ke/utils/kmatrix.js kalite/distributed/static/js/distributed/perseus/ke/utils/knumber.js kalite/distributed/static/js/distributed/perseus/ke/utils/kpoint.js kalite/distributed/static/js/distributed/perseus/ke/utils/kray.js kalite/distributed/static/js/distributed/perseus/ke/utils/kvector.js kalite/distributed/static/js/distributed/perseus/ke/utils/math-format.js kalite/distributed/static/js/distributed/perseus/ke/utils/math.js kalite/distributed/static/js/distributed/perseus/ke/utils/matrix-input.js kalite/distributed/static/js/distributed/perseus/ke/utils/mean-and-median.js kalite/distributed/static/js/distributed/perseus/ke/utils/objective_.js kalite/distributed/static/js/distributed/perseus/ke/utils/parabola-intuition.js kalite/distributed/static/js/distributed/perseus/ke/utils/polynomials.js kalite/distributed/static/js/distributed/perseus/ke/utils/probability.js kalite/distributed/static/js/distributed/perseus/ke/utils/qhints.js kalite/distributed/static/js/distributed/perseus/ke/utils/rational-expressions.js kalite/distributed/static/js/distributed/perseus/ke/utils/scratchpad.js kalite/distributed/static/js/distributed/perseus/ke/utils/slice-clone.js kalite/distributed/static/js/distributed/perseus/ke/utils/spin.js kalite/distributed/static/js/distributed/perseus/ke/utils/stat.js kalite/distributed/static/js/distributed/perseus/ke/utils/subhints.js kalite/distributed/static/js/distributed/perseus/ke/utils/tex.js kalite/distributed/static/js/distributed/perseus/ke/utils/time.js kalite/distributed/static/js/distributed/perseus/ke/utils/tmpl.js kalite/distributed/static/js/distributed/perseus/ke/utils/transform-helpers.js kalite/distributed/static/js/distributed/perseus/ke/utils/triangle-congruence.js kalite/distributed/static/js/distributed/perseus/ke/utils/unit-circle.js kalite/distributed/static/js/distributed/perseus/ke/utils/visualizing-derivatives.js kalite/distributed/static/js/distributed/perseus/ke/utils/word-problems.js kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-defaults.js kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-ellipse.js kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-line.js kalite/distributed/static/js/distributed/perseus/ke/utils/wrapped-path.js
Sidebar bug fix and test fix up
That setting is referenced nowhere else, and furthermore the block of code uses an undefined name "dubbed_id". So if executed, it would result in an error. It's not obvious to me what value *should* go there, hence removing it.
Making this test *possible* was actually quite challenging. Changes: 1. Added the object `window._kalite_debug` to our base js bundle, so that I could track the state of the video player in tests in order to avoid race conditions. 2. In video/views.js, publish the state using `_kalite.debug` and avoid a divide-by-zero error. 3. In base_environment, create and teardown a video for testing subtitle availability. It was a bit tricky to figure out exactly *how* to do this -- I had to inspect a real video to figure out the expected format of extra_fields, and it turns out that a video must also have a parent object in order to be able to navigate to it/load it properly. 4. Add a new function to `behave_helpers` specific to the learn page. This sort of gets at the idea of page objects (see the Selenium docs), wherein one defines an API for each page in the app being tested. 5. Created a couple functions in content_models in order to create the video mentioned above.
The context is set by the @set_database decorator.
use twine for PyPi uploads
Escapes %s to stop sprintf throwing an error.
…ubtitles Migrate to VTT subtitle format
…rereleases/0.16b2
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.
WARNING! Merging this, merges and closes all PRs contained in this PR, and they may have a separate review process and amendments following. So don't merge this PR!! :)
Takes over 0.16b1 #4945
New release, manually brewing the distributions:
Known issues
Included PRs
Installer links