Permalink
Commits on Sep 29, 2012
  1. Merge pull request #30904 from saasmath/master

    xymostech committed Sep 29, 2012
    jQuery .data() expects just a key when retrieving values
Commits on Sep 27, 2012
  1. jQuery .data() expects just a key when retrieving values.

    Gary Anderson
    Gary Anderson committed Sep 27, 2012
    The existing code breaks some exercises (like function_1 and many more)
    when using a version of jQuery greater than 1.7.1.
    
    See http://api.jquery.com/data/
Commits on Sep 25, 2012
  1. Add exercise: Graphs of inequalities

    beneater committed Sep 25, 2012
    Summary:
    new problem type in graphing_inequalities
    
    finished hints sans link
    
    fixed inequality hints
    
    added more hints for point-slope formula in inequalities
    
    removed transformations exercises...
    
    Differential Revision: http://phabricator.khanacademy.org/D433
  2. Add exercise: Linear equation word problems

    beneater committed Sep 25, 2012
    Summary:
    These exercises were made a while ago but were never used. Now, they should be
    good!
    
    Differential Revision: http://phabricator.khanacademy.org/D498
Commits on Sep 24, 2012
  1. Support positioning of graphie labels by specifying an angle

    sophiebits committed Sep 24, 2012
    Test Plan:
    Created a dummy exercise that plotted a point and drew a label at
    various different angles relative to the plotted point.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D766
Commits on Sep 23, 2012
  1. Merge pull request #30647 from xymostech/fix-calculator-exponent

    sophiebits committed Sep 23, 2012
    Fix calculator exponent associative order
Commits on Sep 21, 2012
  1. Add calculator

    beneater committed Sep 21, 2012
    Test Plan: Tested outside devappserver by typing in some random expressions
    
    Reviewers: alpert
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D756
Commits on Sep 19, 2012
  1. Fix up exercises that are too wide for tutorials

    beneater committed Sep 19, 2012
    Reviewers: marcos, tom, desmond
    
    Differential Revision: http://phabricator.khanacademy.org/D737
Commits on Sep 18, 2012
  1. Handle case in combining_like_terms_2 where constant terms simplify to 0

    beneater committed Sep 18, 2012
    Summary:
    fix #26874; fix #29882; fix #29943; fix #29949; fix #29964; fix #29969;
    fix #30088; fix #30091; fix #30108; fix #30118; fix #30138; fix #30177;
    fix #30205; fix #30257; fix #30258; fix #30276; fix #30279; fix #30280
    
    Previously, the last hint would show something like "-24a + 0" and the regex
    answer would expect you to type "-24a0". This fixes the final hint to show just
    "-24a" and the answer regex expects "-24a"
    
    Test Plan:
    Tested these problematic seeds outside devappserver (before and after the fix):
    http://localhost:8000/exercises/combining_like_terms_2.html?debug&seed=112&problem=c_fd_fbx
    http://localhost:8000/exercises/combining_like_terms_2.html?debug&seed=177&problem=c_fd_fbx
    http://localhost:8000/exercises/combining_like_terms_2.html?debug&seed=161&problem=c_fd_fbx
    
    Reviewers: stephanie
    
    Reviewed By: stephanie
    
    Differential Revision: http://phabricator.khanacademy.org/D742
Commits on Sep 13, 2012
  1. Merge pull request #30040 from smenks13/oneStepIntuition

    beneater committed Sep 13, 2012
    Fix exercise: One-step equation intuition
Commits on Sep 11, 2012
  1. Remove a stray console.log()

    beneater committed Sep 11, 2012
Commits on Sep 10, 2012
  1. Use regex answer type to avoid dependency on math-model

    beneater committed Sep 10, 2012
    Summary: I changed this to use regexs to check the answer and made it pretty liberal (i.e. it's always ok to run a -1 through everything)
    
    Differential Revision: http://phabricator.khanacademy.org/D566
  2. Basic Construction Framework

    beneater committed Sep 10, 2012
    Summary:
    In the interest of keeping code review size down, here's the basic framework for constructions with a test exercise.
    The main obstacle left is correct answer detection.
    
    There's one UI issue that is still problematic: not sure how to deal with disposing of individual compasses/lines.
    Right now you can drag compasses into a "trash" area in the bottom right, and clear the whole area, but that isn't ideal.
    
    CC: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D667
  3. Move the scratchpad controls to the top to preserve horizontal screen…

    beneater committed Sep 10, 2012
    … space
    
    Summary: Dunno how I feel about this, but here it is for folks to take a look at.
    
    Reviewers: marcos, alpert
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D711
Commits on Sep 5, 2012
  1. Update problemarea width to something reasonable for tutorials

    beneater committed Sep 5, 2012
    Changed the width from 63% to 70% to account for the narrower answer area.
    70% also doesn't break the old layout: there's still a reasonable gutter
    between the question and answer.
  2. Add support for <script type="text/graphie"> tags!

    beneater committed Sep 5, 2012
    Reviewers: alpert
    
    Reviewed By: alpert
    
    CC: emily, mark
    
    Differential Revision: http://phabricator.khanacademy.org/D556
Commits on Sep 4, 2012
  1. mv {,Drawing}Scratchpad

    sophiebits committed Sep 4, 2012
Commits on Sep 3, 2012
  1. Sync exercise dev mode layout with tutorials changes

    beneater committed Sep 3, 2012
    Reviewers: alpert
    
    Reviewed By: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D710
Commits on Sep 1, 2012
  1. Merge pull request #28661 from joelburget/master

    beneater committed Sep 1, 2012
    timeline improvements