Skip to content
Commits on Jul 18, 2012
  1. @beneater

    Remove email field from GitHub issue reports #FIXIT (53 minutes ahead…

    … of schedule)
    
    Reviewers: alpert, kamens
    
    Reviewed By: kamens
    
    Differential Revision: http://phabricator.khanacademy.org/D412
    beneater committed Jul 18, 2012
Commits on Jul 13, 2012
  1. @beneater

    Merge pull request #26083 from beneater/custom-stack-test

    Add custom problem types for custom stack test
    beneater committed Jul 13, 2012
  2. @spicyj

    Merge pull request #26036 from xymostech/fix-line-charts

    Fix day abbreviations and some lint
    spicyj committed Jul 13, 2012
  3. @xymostech
  4. @beneater
  5. @osnr

    Merge pull request #26018 from osnr/master

    Use fractions internally in circles_and_arcs and areas_of_circles_and_sectors to avoid precision error
    osnr committed Jul 12, 2012
  6. @osnr

    Use fractions internally in circles_and_arcs and areas_of_circles_and…

    …_sectors to avoid precision error
    osnr committed Jul 12, 2012
Commits on Jul 12, 2012
  1. @xymostech

    remove returns in show-guess

    xymostech committed Jul 11, 2012
Commits on Jul 11, 2012
  1. @osnr

    Merge pull request #25555 from osnr/master

    Add area exercises
    osnr committed Jul 11, 2012
  2. @osnr
  3. @osnr
  4. @osnr
  5. @osnr

    Solution tag for shaded areas

    osnr committed Jul 11, 2012
  6. @tomyedwab
  7. @mwittels @beneater

    Merge and squash pull request #25699 from mwittels/proofsPart1

    Closes #25699
    
    commit fee767d
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Tue Jul 10 16:26:18 2012 -0700
    
        users can add up to 3 tick marks to figures
    
    commit 3c1c4e3
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Tue Jul 10 16:10:52 2012 -0700
    
        remove superfluous code tags
    
    commit c6d0388
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Tue Jul 10 15:38:05 2012 -0700
    
        fixed bug with proof representation, removed console.logs
    
    commit ce26ed2
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Tue Jul 10 15:30:53 2012 -0700
    
        representation of known proof in predictable order, allows reflexive property on one problem type
    
    commit 08316a0
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Tue Jul 10 15:12:11 2012 -0700
    
        intro proof exercise statement entry and dynamic hints
    
    commit d6348ae
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Mon Jul 9 20:16:30 2012 -0700
    
        fix proof output bug in geo proofs 2
    
    commit 6316168
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Mon Jul 9 19:18:31 2012 -0700
    
        intro proofs vertical case working
    
    commit 99d4689
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Mon Jul 9 16:42:33 2012 -0700
    
        changed highlighting to work with appengine load order
    
    commit 63bfc3b
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Mon Jul 9 16:08:09 2012 -0700
    
        changed figure in find-wrong-statement exercise, updated problem descriptions
    
    commit 11a00d2
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Mon Jul 9 16:00:47 2012 -0700
    
        changed figure in fill-in-blanks exercise
    
    commit 76d3b77
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Mon Jul 9 02:04:55 2012 -0700
    
        fixed errors where statements were duplicated in proof, hints were undefined
    
    commit 853771f
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Sun Jul 8 23:46:29 2012 -0700
    
        fixing merge conflicts part II
    
    commit 9667caf
    Merge: 39c0dfa 0d92ec0
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Sun Jul 8 23:39:31 2012 -0700
    
        merge conflicts
    
    commit 39c0dfa
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Sun Jul 8 23:37:30 2012 -0700
    
        renamed first exercise to geo proofs intro
    
    commit 9dc99f3
    Author: Mark Wittels <mark@khanacademy.org>
    Date:   Sun Jul 8 23:34:20 2012 -0700
    
        changed triangle highlighting to not rely on triangle proof objects
    mwittels committed with beneater Jul 11, 2012
  8. @beneater

    Merge pull request #25208 from Christi/estimating_roots

    estimating square roots
    beneater committed Jul 10, 2012
  9. @Christi
  10. @osnr
  11. @osnr

    merge

    osnr committed Jul 10, 2012
  12. @osnr

    Use translation animation for area of parallelograms hint to be compa…

    …tible with old Raphael
    osnr committed Jul 10, 2012
  13. @osnr
  14. @osnr

    Add new exercise: areas of trapezoids, rhombi, and kites. Also teensy…

    … style change to area of parallelograms.
    osnr committed Jul 5, 2012
  15. @osnr
  16. @osnr
  17. @osnr

    Add new exercise: shaded areas.

    osnr committed Jun 26, 2012
  18. @osnr

    Add new exercise: circles and arcs. Tests how to calculate arc length…

    … and arc central angle stuff.
    osnr committed Jun 21, 2012
Commits on Jul 10, 2012
  1. @osnr
  2. @tomyedwab
  3. @tomyedwab

    Reverting changes due to adding modes (0ee8d0c) that should not have …

    …been merged to stable.
    tomyedwab committed Jul 10, 2012
Commits on Jul 9, 2012
  1. @xymostech

    Merge pull request #25754 from xymostech/master

    Fix Exercises not defined bug
    xymostech committed Jul 9, 2012
  2. @xymostech

    Fix bug with Exercises not defined

    Since Exercises is not defined in local testing, we need to test for
    testMode before using it. Tested in local and in GAE. Still breaks a
    bit in GAE, but should be fixed by near updates.
    xymostech committed Jul 9, 2012
  3. @tomyedwab

    Merge branch 'master' of http://github.com/Khan/khan-exercises into o…

    …rigin/power-mode-rewards
    tomyedwab committed Jul 9, 2012
Commits on Jul 6, 2012
  1. @beneater

    Replace < with &lt;

    beneater committed Jul 6, 2012
  2. @mwittels

    Merge pull request #25558 from mwittels/proofsPart1

    fix for fill in blanks exercise
    mwittels committed Jul 6, 2012
  3. @mwittels
Something went wrong with that request. Please try again.