Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 1, 2013
  1. @tzjames
Commits on Mar 29, 2013
  1. @tzjames

    Added functionality to khan-exercise.js so that it can handle the ski…

    tzjames authored
    …p question button. This goes along with review https://khanacademy.kilnhg.com/Review/K117906
    
    Summary: Added functionality to khan-exercise.js so that it can handle the skip question button. This goes along with review https://khanacademy.kilnhg.com/Review/K117906
    
    Test Plan:
    Load an exercise and make sure the new code doens't break anything because of the lack of a skip button
    Load an assessment in a phantom window until you are in the right a/b test. Then test out clicking the skip question button multiple times quickly to make sure that only one request is sent.
    
    Reviewers: jace, alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D2116
Commits on Mar 28, 2013
  1. @spicyj

    Don't use code tags when passing math to MathJax

    spicyj authored
    Test Plan:
    Loaded addition 1.
    
    Auditors: eater
  2. @spicyj

    Fix code tags with spans in them

    spicyj authored
    Test Plan:
    Didn't see crazy HTML MathJax stuff at /exercises/ideal_stoichiometry.html?seed=83&problem=na-cl2---nacl&debug.
    
    Auditors: eater
  3. @spicyj

    Fix smiley face src

    spicyj authored
    Auditors: eater, cbhl
Commits on Mar 27, 2013
  1. @beneater

    Don't round integer answers before validating them

    beneater authored
    Summary: Can you see a problem with this?
    
    Test Plan:
    http://localhost:8000/exercises/completing_the_square_1.html?debug&problem=original&seed=2&activity=%5B%5B%22incorrect-activity%22%2C%22%5B%5C%224.9%5C%22%2C%5C%22-6.9%5C%22%5D%22%2C3%5D%2C%5B%22correct-activity%22%2C%22%5B%5C%225%5C%22%2C%5C%22-7%5C%22%5D%22%2C3%5D%5D
    
    http://localhost:8000/exercises/converting_decimals_to_fractions_2.html?debug&problem=into-mixed&seed=91&activity=%5B%5B%22incorrect-activity%22%2C%22%5C%229.29%5C%22%22%2C6%5D%2C%5B%22correct-activity%22%2C%22%5C%229%2029%2F100%5C%22%22%2C4%5D%5D
    
    http://localhost:8000/exercises/converting_fractions_to_decimals.html?debug&problem=0&seed=25&activity=%5B%5B%22correct-activity%22%2C%22%5C%220.438%5C%22%22%2C8%5D%2C%5B%22correct-activity%22%2C%22%5C%220%2C438%5C%22%22%2C4%5D%5D
    
    http://localhost:8000/exercises/multiplication_4.html?debug&problem=0&seed=111&activity=%5B%5B%22correct-activity%22%2C%22%5C%2241.976%5C%22%22%2C19%5D%2C%5B%22correct-activity%22%2C%22%5C%2241%2C976%5C%22%22%2C3%5D%2C%5B%22correct-activity%22%2C%22%5C%2241976%5C%22%22%2C1%5D%5D
    
    Reviewers: alpert
    
    Reviewed By: alpert
    
    CC: peter
    
    Differential Revision: http://phabricator.khanacademy.org/D2112
  2. @spicyj

    Merge branch 'perseus'

    spicyj authored
    Conflicts:
    	khan-exercise.js
  3. @spicyj

    Don't load perseus packages so we can merge in to stable

    spicyj authored
    Test Plan:
    Loaded addition 1.
Commits on Mar 26, 2013
  1. @csilvers

    , -> ;

    csilvers authored
    Summary:
    I accidentally replaced a comma with a semicolon in my last commit.
    Change it back.
    
    Test Plan: Fingers crossed
    
    Reviewers: eater, alpert
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D2113
  2. @beneater

    Merge pull request #43440 from petercollingridge/rational-expr

    beneater authored
    Adding and subtracting rational expressions 1
  3. @tomyedwab

    (Finally) eliminate CustomStack entity and all related code in a sea …

    tomyedwab authored
    …of red lines. (Rest of changeset in Mercurial)
    
    Auditors: eater
Commits on Mar 25, 2013
  1. @beneater

    Merge pull request #43733 from petercollingridge/rat-exp-2

    beneater authored
    Adding and subtracting rational expressions 2
  2. @petercollingridge

    Add back some spaces

    petercollingridge authored
  3. @petercollingridge

    Add back some spaces

    petercollingridge authored
  4. @petercollingridge
  5. @petercollingridge
  6. @petercollingridge

    Change var to div

    petercollingridge authored
  7. @beneater

    Merge pull request #43658 from petercollingridge/exp-value

    beneater authored
    Fix formatting for expected value question
  8. @beneater

    Merge pull request #43432 from petercollingridge/rate-hints3

    beneater authored
    Rewrite rate problem hints
  9. @petercollingridge

    Format text properly

    petercollingridge authored
  10. @petercollingridge
  11. @petercollingridge
Commits on Mar 24, 2013
  1. @petercollingridge
  2. @petercollingridge
  3. @petercollingridge
  4. @spicyj

    attemptSaved doesn't appear to be used anywhere...

    spicyj authored
    Auditors: eater, cbhl
  5. @spicyj

    Fix show solution button text

    spicyj authored
    Auditors: eater, cbhl
Commits on Mar 23, 2013
  1. @spicyj

    Perseus topic mode, khan-exercises MathJax 2 fixes

    spicyj authored
    Auditors: eater, cbhl
  2. @spicyj

    Misc changes to make perseus exercises a reality

    spicyj authored
    Auditors: eater, cbhl
  3. @spicyj

    Only bind events once in live mode

    spicyj authored
    Test Plan:
    Load Addition 1 and see only one copy of the problem.
    
    Auditors: eater, cbhl
  4. @spicyj

    Move hints.js code into interface.js

    spicyj authored
    Test Plan:
    Took hints, got acceptable formats.
    
    Auditors: eater, cbhl
  5. @spicyj

    Make local mode work again and fix a few bugs

    spicyj authored
    Auditors: eater, cbhl
  6. @spicyj

    Split out most exercise interface code

    spicyj authored
    There is no scenario in which this is not a bitch to review. Sorry.
    
    TODO: make local mode work again
    TODO: get rid of utils/hints.js and merge with exercise-package/interface.js
    
    Test Plan:
    Did problems in Addition 1 locally and took hints and saw buttons update and lost leaves.
  7. @spicyj

    Move interface.js to within khan-exercises

    spicyj authored
    (No other changes)
    
    Test Plan:
    Loaded Addition 1.
Commits on Mar 22, 2013
  1. @petercollingridge
Something went wrong with that request. Please try again.