Permalink
Browse files

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
  • Loading branch information...
1 parent 7547602 commit ed0be47ab9141afa384e0b300086b78c6201421c @mwittels mwittels committed with beneater Jul 11, 2012
Showing with 1,407 additions and 561 deletions.
  1. +179 −234 exercises/geometry_proofs_1.html
  2. +247 −291 exercises/geometry_proofs_2.html
  3. +834 −0 exercises/geometry_proofs_intro.html
  4. +147 −36 utils/proofs.js
Oops, something went wrong.

0 comments on commit ed0be47

Please sign in to comment.