Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 3, 2015
  1. @petercollingridge

    Update views of a function exercise

    petercollingridge authored
    Summary: For an email request from Tomer
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Subscribers: justin
    
    Differential Revision: https://phabricator.khanacademy.org/D16692
  2. @petercollingridge

    Improve hints for comparing fractions exercises

    petercollingridge authored
    Summary:
    For an email request from Lindsay Spears and Cameron Christensen. I've updated how the code for drawing arrows works. I don't think it should break anything and was bit confusing previously since for short paths it didn't draw the arrows but didn't raise an error. It seems also this is the only khan-exercise that uses curvyArrow.
    Improve hints
    
    Allow arrows to be drawn on short paths
    
    Update hints
    
    Test Plan: Try the hints and ensure they make sense.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D16999
  3. @petercollingridge

    Ensure that numbers aren't signed and make hints more consistent with…

    petercollingridge authored
    … other hints
    
    Test Plan: Try some exercise and make sure there aren't any negative numbers.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D16825
  4. @petercollingridge

    Simplify ellipse intuition exercise

    petercollingridge authored
    Summary: For an email request from Justin
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17434
  5. @petercollingridge

    Avoid repeated inequality in answer

    petercollingridge authored
    Summary: Avoid having two an answer contain the same inequality as described at https://khanacademy.atlassian.net/browse/AI-536286
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17662
  6. @petercollingridge
  7. @petercollingridge

    Remove exercise about area of kites

    petercollingridge authored
    Summary: For an email request from Ben Stenhaug. Cameron also asked for the exercise to be renamed Area of trapezoids.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D19029
  8. @petercollingridge

    Adjust question to avoid answer prompt from blocking part of the clock

    petercollingridge authored
    Summary: For an email request from Priya. Ideally we could disable the prompt, but if we can't or don't want to, this should be slightly better.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D19030
Commits on Jun 25, 2015
  1. @brownhead

    Prevent non-blocking error when taking hints.

    brownhead authored
    Summary:
    Asana task: https://app.asana.com/0/27216215224639/38544742984105
    
    If you don't pass the exercises_server_action_queue bridge, you will
    run into a JS error when taking hints on a Khan Exercises problem. This
    error will not prevent any behavior though (ie: you'll still get a hint
    and everything will be fine).
    
    Additionally, remove a variable that was set and then never accessed.
    
    Test Plan:
    1) Go to /math/trigonometry/less-basic-trigonometry/law-sines-cosines/e/law_of_sines
       while *not* passing the exercises_server_action_queue.
    2) Take a hint.
    3) See no JS errors!
    
    Reviewers: phillip, jlfwong
    
    Reviewed By: jlfwong
    
    Differential Revision: https://phabricator.khanacademy.org/D18849
Commits on Jun 20, 2015
  1. @petercollingridge

    Reduce graphie area to fit the question area

    petercollingridge authored
    Summary: For an email request from Sandy K
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D18723
Commits on Jun 19, 2015
  1. @lemonade512

    Adding new code to gandalf bridge

    lemonade512 authored
    Auditors: johnsullivan
  2. @beneater

    Fix js errors in local mode for exercise screenshotting

    beneater authored
    Summary:
    We have a nightly process that grabs screenshots of all of our exercises to use
    in various places around the site. This process uses khan-exercises in local
    mode (i.e., standalone, outside of webapp) so that it can pass in specific
    seeds and problem types in order to screenshot particular problems.
    
    For example, it does things like load the following URL and screenshot
    the contents of `div#problemarea`:
    http://sandcastle.kasandbox.org/media/castles/Khan:master/exercises/law_of_cosines.html?problem=find-side&seed=64
    
    This diff fixes some javascript errors that occur only in local mode that are
    currently preventing the screenshotter from doing its thing.
    
    Test Plan:
    1. From khan-exercises, run `python -m SimpleHTTPServer 9999`
    2. Load http://localhost:9999/exercises/law_of_cosines.html?problem=find-side&seed=64
    3. Verify there are no JS errors in the console
    4. Copy this new interface.js into webapp/khan-exercises
    5. Load http://localhost:8080/exercise/addition_1
    6. Answer questions and verify in chrome network panel that POSTs are going to /api/internal/.../attempt
    7. But mostly cross fingers this doesn't break anything in D18611 and D18675
    
    Reviewers: phillip, johnsullivan
    
    Reviewed By: phillip, johnsullivan
    
    Differential Revision: https://phabricator.khanacademy.org/D18742
  3. @petercollingridge

    Update fractions for ordering fractions

    petercollingridge authored
    Summary: Update fractions based on email request from Lindsay. Hints based on https://www.khanacademy.org/quetzalcoatl/lindsay-world/lindsayland3/e/lindsay-ideas-3/edit/xd07e73d879912d79
    
    Test Plan: Make sure the hints still make sense.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17070
  4. @petercollingridge

    Remove unnecessary answer types

    petercollingridge authored
    Summary: Change answer type from rational to proper so only the relevant types show up, as per email request from Priya. Also make more i18n friendly.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17345
  5. @petercollingridge

    Update converting fractions to decimals hints

    petercollingridge authored
    Summary: Update hints to match request from Priya: https://www.khanacademy.org/quetzalcoatl/priyas-palace/court/e/priya-ideas-d/edit/xa98f71ca4b76cd79
    
    Test Plan: Try the hints, including when the answer is > 1 and when the denominator is 10 and 100.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17346
  6. @petercollingridge

    Update hints for adding fractions 0.5

    petercollingridge authored
    Summary: Email request from Lindsay to make hints follow https://www.khanacademy.org/quetzalcoatl/lindsay-world/lindsayland3/e/lindsay-ideas-2/edit/x308e5e365c286ccd
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17371
  7. @petercollingridge

    Update hints for decimals on the number line 1

    petercollingridge authored
    Summary: Email request from Priya to make hints follow https://www.khanacademy.org/quetzalcoatl/priyas-palace/court/e/priya-ideas-d/edit/x9822bd0e84a19981
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17389
  8. @petercollingridge
  9. @petercollingridge

    Remove two exercise types and replace dfrac with div

    petercollingridge authored
    Summary: Email request from Ben Stenhaug
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17549
  10. @petercollingridge

    Make numbers mathy and restructure

    petercollingridge authored
    Summary: Make numbers mathy for Ben Stenhaug. I also removed all the code for testing whether the numbers are singular since they never are and I don't think we would ever want them to be. And I split the exercise into four type, mainly so it's easier to test.
    
    Test Plan: Check the hints for each exercise type has mathy numbers and still makes sense.
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17563
  11. @petercollingridge
  12. @petercollingridge
  13. @petercollingridge

    Simplify hints

    petercollingridge authored
    Summary: Improve hints for an email request from Lindsay and Cameron Christensen
    
    Test Plan: Try the hints and ensure they make sense
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17032
  14. @petercollingridge

    Fix angle in hint

    petercollingridge authored
    Summary: For https://khanacademy.atlassian.net/browse/AI-498364
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D16114
  15. @petercollingridge
  16. @petercollingridge

    Make constructions 3 more lenient

    petercollingridge authored
    Summary: For https://khanacademy.atlassian.net/browse/AI-633978
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17806
  17. @petercollingridge

    Add final hints to dividing fracions questions

    petercollingridge authored
    Summary: For an email request for Lindsay Spears
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17899
Commits on Jun 18, 2015
  1. @lemonade512

    Note about last few commits

    lemonade512 authored
    We pushed these without ammending by accident
    
    From diff D18675
    187b4fd
    
    From diff D18611
    1bca6c9
    43f7515
    a6a5331
    8ff0f6f
    6b6e39e
  2. @lemonade512
Commits on Jun 17, 2015
  1. @lemonade512

    Created a gandalf bridge to hide the new server action queue

    lemonade512 authored
    Test Plan:
    - Go to an exercise
    - Make sure the action queue is not being used if not behind the bridge
    
    Reviewers: johnsullivan
    
    Differential Revision: https://phabricator.khanacademy.org/D18675
  2. @lemonade512
  3. @lemonade512
  4. @petercollingridge

    Fix angle colour in question

    petercollingridge authored
    Summary: For https://khanacademy.atlassian.net/browse/AI-679303
    
    Test Plan: Make sure colour of angle name matches colour on diagram in http://sandcastle.kasandbox.org/media/castles/Khan:master/exercises/angles_2.html?seed=176&problem=opp-parallel&debug&lang=en
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17550
  5. @petercollingridge

    Replace 'Fill in the blank' with 'Compare'

    petercollingridge authored
    Summary: For an email request from Lindsay
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17369
  6. @petercollingridge

    Remove one-step exercise type from writing expressions

    petercollingridge authored
    Summary: For an email request from Ben Stenhaug
    
    Reviewers: emily, eater
    
    Reviewed By: eater
    
    Differential Revision: https://phabricator.khanacademy.org/D17368
Something went wrong with that request. Please try again.