Permalink
Commits on Sep 1, 2011
  1. massive merge

    nsfmc committed Sep 1, 2011
Commits on Aug 31, 2011
  1. Merge branch 'mathjax'

    marcia committed Aug 31, 2011
  2. Warn when using image fonts.

    marcia committed Aug 31, 2011
    Downside of this implementation:
    -- I couldn't intelligently re-use phantom notification bar code because it's outside of khan-exercises. This throws yet another messagy construct at the user, but this message is hopefully so infrequent that we can bear this travesty for now.
    -- The warning appears when the web font attempt times out, so there is still a delay.
    -- Need to provide a link to explain how to enable web fonts
Commits on Aug 30, 2011
  1. Iterate right # of times

    marcia committed Aug 30, 2011
  2. Revert "Merge pull request #1664 from jpulgarin/master"

    sophiebits committed Aug 30, 2011
    This reverts commit 1e237f4, reversing
    changes made to 791a188.
  3. Spacing tweak

    sophiebits committed Aug 30, 2011
  4. Merge pull request #1874 from mjptak/fix_recognizing_conic_sections

    sophiebits committed Aug 30, 2011
    1825 fix recognizing conic sections
Commits on Aug 29, 2011
  1. Merge pull request #1664 from jpulgarin/master

    sophiebits committed Aug 29, 2011
    Fixing "data-each + data-if" templating bug, thx @julian
  2. Small scope fix

    Julian Pulgarin committed Aug 29, 2011
  3. Used @spicyj's suggestion to remove all attributes after first templa…

    Julian Pulgarin committed Aug 29, 2011
    …ting
Commits on Aug 27, 2011
  1. Made triangle types in pyth theorem 2, nicer and more consistent with…

    igorT committed Aug 27, 2011
    … the video by removing the degree sign
Commits on Aug 26, 2011
  1. Multiple answer type now reads in manually written examples for each …

    osnr committed Aug 26, 2011
    …exercise from example-class elements in the solution area. Fixes #973.