Skip to content
This repository

Jul 03, 2014

  1. Ben Alpert

    Fix tag nesting

    Auditors: eater
    spicyj authored
  2. Peter Collingridge

    Improve imaginary number hints

    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D10172

Mar 05, 2014

  1. Ben Alpert

    Use requirejs for module loading

    Summary: Also did some misc cleanup in khan-exercise.js, mostly related to module-y things ("151 ++----"). I combined local jquery-ui into one file to make it easier to load.
    
    Test Plan:
    Opened addition_1, deriviative_intuition, graphing_points_2 locally, and all looked fine.
    
    In webapp/khan-exercises/, ran:
    
    ```
    npm install -g requirejs
    r.js -o requirejs.config.js
    ```
    
    then saw that /exercises/addition_1 looked right.
    
    Reviewers: eater, jack
    
    Reviewed By: jack
    
    CC: alex
    
    Differential Revision: http://phabricator.khanacademy.org/D7095
    spicyj authored

Apr 25, 2013

  1. John Resig

    Run clean-exercises on the HTML exercises, fixing the entities inside…

    … the data-if attributes.
    jeresig authored

Apr 24, 2013

  1. John Resig

    Re-run the exercises through the updated cleaner.

    jeresig authored

Apr 22, 2013

  1. John Resig

    Clean up the newly-changed HTML exercises and also fix up the constan…

    …tly-expanding whitespace problem in the cleaner.
    jeresig authored

Apr 17, 2013

  1. Michael Chang

    Clean up the exercise files using the new cleaning utility. (III)

    cbhl authored

Apr 16, 2013

  1. Michael Chang

    Clean up the exercise files using the new cleaning utility. (II)

    cbhl authored
  2. John Resig

    Two doctypes were being output. Only output one.

    jeresig authored
  3. John Resig

    Clean up the exercise files using the new cleaning utility.

    jeresig authored

Apr 10, 2012

  1. Ben Eater

    lint: tabs->spaces and jQuery->$ for exercises

    beneater authored

Jan 24, 2012

  1. Michal Pokorný

    Squashed commit of the following:

    commit a311c35
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 24 10:21:02 2012 +0100
    
        fallback in complexNumberSeparate answer type
    
    commit e0aafeb
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 22 19:22:36 2012 +0100
    
        special hints for case of 1 in Powers of complex numbers 1
    
    commit fe4861b
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 22 19:11:58 2012 +0100
    
        fix minor bug in Powers of complex numbers 1
    
    commit 26a4bf2
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 21 17:24:50 2012 +0100
    
        some changes in Powers of complex numbers 1 hints
    
    commit d33a05b
    Merge: 0a4e018 06d13c6
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 21 16:43:35 2012 +0100
    
        Merge branch 'complex-powers' into complex-exercises
    
    commit 06d13c6
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 21 15:28:26 2012 +0100
    
        fixes in Powers of complex numbers 1
    
    commit 0a4e018
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 21 15:09:51 2012 +0100
    
        fix not rendering polar form representation on exercise load
    
    commit 3a605b3
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 21 15:03:00 2012 +0100
    
        add Powers of complex numbers 1
    
    commit b943b6faab7a7ee184043efa607be4cc59e81f9f
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 19 10:45:46 2012 +0100
    
        divide long hint
    
    commit d9785b8202770390e2c41751d2de69531c039225
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 19 10:40:15 2012 +0100
    
        nitpicking everywhere
    
    commit c88cf1a0f2908f02e32e1da9fe15681e4f8352fa
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 19 10:13:13 2012 +0100
    
        fix hints in Imaginary unit powers
    
    commit b0446e5939999ce5478900a0fae6c02ba684a5ca
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 19 10:07:31 2012 +0100
    
        some formatting nits
    
    commit 32cf9822651978b449072782e6682f4db12d79d6
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 19 09:51:20 2012 +0100
    
        fixes in formatting of complex numbers
    
    commit 6be794b6a61783e81151a1684ad4856fc98777c8
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 19 09:23:19 2012 +0100
    
        move complex number formatting to math-format
    
    commit 6342f00943560b160dae851bad22d0a5a72247b9
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 23:02:15 2012 +0100
    
        nitpicking
    
    commit 7dcf1c160d1b90ab9011dfdaa67b38ca191c2b15
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 22:58:07 2012 +0100
    
        move Div. and Mult. complex numbers to new answer type
    
    commit 09b64540e2070a5bfbd3fd9d3dc200e2bdfccf0b
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 22:52:07 2012 +0100
    
        move Adding and subtracting cplx numbers answer type to answer-types.js
    
    commit f0701a5c6d2ac3d6e9b50b028e504fe46aa752ca
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 21:39:00 2012 +0100
    
        factor answer type out
    
    commit 30c160bac7cb5ea333ecf76afa09fa36130cae19
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 20:37:43 2012 +0100
    
        some formatting and refactoring
    
    commit aff62607234b9e0c8f639fb2b9bfee7426f2646b
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 20:26:29 2012 +0100
    
        sync controls between exercises
    
    commit be6e14fd1802e2b6d334416199447254fd58fae2
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 20:23:11 2012 +0100
    
        refactor Dividing complex numbers
    
    commit 2aa5039f90440ee2a8ea79b0dae3cbad2e259236
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 18 19:59:54 2012 +0100
    
        formatting; bigger label distance in Absolute value of cplx. numbers
    
    commit 0088549c6f82987e5c7b82ebfaaa773c69ef0ed9
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 17 19:06:07 2012 +0100
    
        colored hints and various formatting in The complex plane
    
    commit 5e5e159545146825e7a4e982b3ba7ae02aaf1e76
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 17 18:57:41 2012 +0100
    
        colored hints and formatting in Multiplying complex numbers
    
    commit a723433f5fc0b068759c6729df9a3da2f84f7013
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 17 18:49:36 2012 +0100
    
        various nits in Imaginary unit powers and Mult. and div. cplx. num. polar forms
    
    commit eaac7a283df8f9105bd8fdbeb3f219f6980368e4
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 17 18:48:52 2012 +0100
    
        format colors using \color in Adding and subtr. complex numbers
    
    commit 99d58300858a49135934d871654d293eac3a760d
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 17 18:30:04 2012 +0100
    
        formatting fixes in Dividing complex numbers
    
    commit a1e31b90d83ee9cd9ea32260557e9b34576875a8
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Jan 17 18:23:40 2012 +0100
    
        color up hints in Adding and subtr. complex numbers
    
    commit 961e0d6a7fc8c89398c250f53ddc0b4a8057bd4d
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Fri Jan 13 23:16:39 2012 +0100
    
        change hint in Multipl. and div. complex number polar forms
    
    commit efb93cdc9d585abdaae207d292095c5c64d00de4
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Fri Jan 13 23:08:34 2012 +0100
    
        beautify complex polar form formatting
    
    commit f7abec56cb31a8cdbfcaa7e3fa63f0249af6bb93
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Fri Jan 13 22:13:38 2012 +0100
    
        several fixes in Multiplying and dividing complex number polar forms
    
    commit 6c7612e98fcd9f336c51b57cb788b947e20b80c5
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Jan 12 00:01:40 2012 +0100
    
        refactor Multiplying and dividing cplx. number polar forms
    
        also nitpick graphie-helpers.js
    
    commit b7cf4353d368677b2c19455544e6eea90382e580
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Jan 11 21:44:13 2012 +0100
    
        group hints with graphie updates in Absolute value of complex numbers
    
    commit d431212f1fecdb811f2ade51753631a7c919230a
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Mon Jan 9 19:18:11 2012 +0100
    
        cleanup Complex number polar form intuition
    
        also darken complex chart helper lines a little bit
    
    commit 6c5ec04b54ee35045b886780f3f14d5ba321605a
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Mon Jan 9 19:09:03 2012 +0100
    
        minor changes in Imaginary unit powers hints
    
    commit 4fdd5186dd8be84c8434befc3c0cb62425a12441
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Mon Jan 9 19:03:28 2012 +0100
    
        expand hints in Absolute value of complex numbers
    
    commit 7f1d7341dc1d7b0759e77faed148d2155283ef7e
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 15:47:09 2012 +0100
    
        fix points out of chart in Mult. & div. complex number polar forms
    
    commit 8edcad697ffb01d1ecad309d68a990c5a2418236
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 15:10:51 2012 +0100
    
        differentiate dividend and divisor in Mult. and div. cplx. num. polar forms
    
    commit 136b3362fbeacbc0b13c2e9f2caad58249e6969f
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 02:47:02 2012 +0100
    
        remove magic constants from Multipl. and div. cplx. number polar forms
    
    commit 547ea551acc5806d7ced6a7bf72eb66f9d0887ed
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 02:38:11 2012 +0100
    
        added graphie to Mult. and div. cplx. number polar forms
    
    commit 0a740ba5ef6c445ab7b36ef5e9ce2cf8ad0e27a8
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 02:13:12 2012 +0100
    
        expand complex number polar form graphie helpers
    
    commit 087e5dade153f036150b816273d5003f67e0fb7c
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 01:44:32 2012 +0100
    
        add complex number polar form graphie helper
    
    commit 4f72a681a439903611ca0d97abe54750f50e4a59
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 00:51:46 2012 +0100
    
        expand hints in Dividing complex numbers
    
    commit acac9c3a04c22316588f4e136d6225f165c7e6ff
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 00:34:00 2012 +0100
    
        expand Multiplying complex numbers hints
    
    commit db3a3e3d5aa2927a86d3c3c45c75cd0acd7be558
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 00:19:32 2012 +0100
    
        Dividing complex numbers: use dfrac instead of frac
    
    commit 646e9339caa7da9cc831662cc10e484b4bbb482b
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 00:13:41 2012 +0100
    
        nitpicking
    
    commit 04a01f61d195b3918d6d5e7438307ecf1dea3a88
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 00:06:50 2012 +0100
    
        use expr in Multiplying complex numbers
    
    commit e93fda1d07ca29c76b3786df4de1c8c9b9e3b894
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 8 00:04:47 2012 +0100
    
        use expr in Absolute value of complex numbers
    
    commit eb8cbdcf52ebc2048206f1e511d1b658c148e015
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 7 23:58:36 2012 +0100
    
        nitpicking in The complex plane
    
    commit 3abf7b28e99530a796777af081f7be881ed8a8a5
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 7 23:51:59 2012 +0100
    
        nitpicking around complex number exercises
    
        expanded hints in Imaginary unit powers harder exercises
    
    commit c93f2f29bcd28f93b300b1b5ad5eef28c32682fe
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 7 23:41:23 2012 +0100
    
        nitpicking in Complex number polar form intuition
    
    commit 233c4b7a61e3370d3ed6d119992b30d69f299be6
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 7 23:35:28 2012 +0100
    
        nitpicking in Adding and subtracting complex numbers
    
    commit 8fad9b4d1333c9faefd5ba5a2ed914752fb40308
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Jan 7 23:29:50 2012 +0100
    
        polishing Absolute value of complex numbers
    
        I'm not drawing the graphie by parts yet, will get to it later...
    
    commit 808566bda892b2498150019137c802a3960fb683
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Mon Jan 2 16:27:40 2012 +0100
    
        fix regressions in Mult. and div. cplx. number polar forms
    
    commit 4209d09259de5add508f59bf27307c39da3ee773
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sun Jan 1 14:33:46 2012 +0100
    
        switch between polar form representations
    
    commit 24e63a21a15b8aaa009ccd9ebc41961ca0011462
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Fri Dec 30 09:53:31 2011 +0100
    
        add complex number polar form division
    
        add complex number polar form division to Multiplying complex number
        polar forms, creating Multiplying and dividing complex number polar
        forms
    
    commit e7ad0ee6af14c0e04a646d7a0dba2f730eb4f572
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Fri Dec 30 01:05:19 2011 +0100
    
        fix not resetting UI variables in Mult. cplx. number polar forms
    
    commit e8698cdc78b229f25f70544693ee032f2c336d60
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Thu Dec 29 21:51:21 2011 +0100
    
        add Multiplying complex number polar forms
    
    commit bb1a37582faf7c558be44666ec7a65dd4c1b170a
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 19:17:39 2011 +0100
    
        typo in The complex plane
    
    commit 0587858699fe1c637e943dc4d15c5732a8fb4010
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 18:59:25 2011 +0100
    
        enhance Complex number polar form intuition
    
        added circles to represent complex numbers with the same radius and
        lines to represent complex numbers with the same angle - helps
        the intuition...
    
    commit 083e9ed8da945dfe7e4cb54d64ebe9ff9d498ea2
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 18:43:04 2011 +0100
    
        add negParens in Dividing complex numbers hints
    
    commit 4b04a24324654bf3707fb7f04423cfbcf8339b3d
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 18:19:52 2011 +0100
    
        add Dividing complex numbers, hopefully last fix in Mult. cplx. numbers
    
    commit 7f1306a15e444ee410c35722be304003b3fda6bd
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 17:21:20 2011 +0100
    
        scratch that, now it's fixed...
    
    commit b40e09cbba69a7f2b6e55cafe2479ff884c83de4
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 17:18:10 2011 +0100
    
        markup fix in Multiplying cplx. numbers
    
    commit 1cda12b5624568ab0a8dfaf3af54f26eb1b18f53
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 16:47:32 2011 +0100
    
        mention distance formula in Absolute value of cplx. numbers
    
    commit ae27392923d992d8b7c9b5ab398114592ea02804
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 16:41:10 2011 +0100
    
        some changes in Imag. unit powers hints (suggested by @Christi)
    
    commit 6a521cd2cb7f621e1f9d5849c34595c2fe72d7a7
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 16:36:31 2011 +0100
    
        simplify Add. and subtr. cplx. numbers
    
        Plus change wording in Multiplying complex numbers hint
    
    commit 20f1e44c1946066f87a3bdb27fd596d73f32b763
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 12:07:06 2011 +0100
    
        expand hints on complex exercises
    
        expand hints in Adding and subtracting complex numbers, Imaginary unit
        powers and Multiplying complex numbers.
    
    commit 4528ca0d6ed6d8b3f54a51f998b463e84048580c
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Wed Dec 28 11:50:47 2011 +0100
    
        expand hints in Absolute value of complex numbers
    
    commit cf99843ea1d343425e9706be5738debc22798f7f
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Dec 27 23:04:24 2011 +0100
    
        small fixes in Complex number polar form intuition
    
        Avoid reinventing the wheel in pi fractions
        Add axis labels
    
    commit 42e13946bfb2c20f34a82df93f4feafafafc118b
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Dec 27 22:52:00 2011 +0100
    
        add exercise Complex number polar form intuition
    
    commit b6f948aef7c596ea81d89ab0d79602522050c747
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Dec 27 22:31:56 2011 +0100
    
        add axis labels to Absolute value of complex numbers hint
    
    commit e8a9f37556316014ac89a62854017f947be5a58d
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Dec 27 21:52:44 2011 +0100
    
        add hints to The complex plane
    
    commit 4611aab618801b47507002df1881fc108938df17
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Tue Dec 27 21:41:18 2011 +0100
    
        add an exercise in graphing complex numbers
    
    commit 34071721beda021dc839567c3e1131f620229df4
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 15:06:20 2011 +0100
    
        add hints to Imaginary unit powers (exponent from 1 to 4)
    
    commit af2d5581d3c275be949a17c8a06c47dbc1cf06b9
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 12:02:05 2011 +0100
    
        add hints to Absolute value of complex numbers
    
    commit 80f0bd235368ce5aa966e7109bc6718e41407877
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 11:33:41 2011 +0100
    
        add Absolute value of complex numbers
    
        Add Absolute value of complex numbers. No hints yet, working on it.
    
    commit dff8f957442302e98125fcde2facec40dc9ecd6f
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 11:20:36 2011 +0100
    
        weight Imaginary unit powers problems
    
    commit 3f18da91ecde3915c9dcd1ebdfaad573105a2110
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 11:17:08 2011 +0100
    
        add Imaginary unit powers exercise
    
        Added Imaginary unit powers exercise, plus some fixes in
        Adding and subtr. cplx. numbers and Multiplying cplx. numbers.
    
    commit 032f83bc389f99297ea46e1644dac1e86dda0099
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 10:21:55 2011 +0100
    
        whoops, fix wrong operation in Mult. cplx. numbers
    
    commit e737116e9bcc196f9ccaad64b11ce1cbd011018a
    Author: Michal Pokorný <pok@rny.cz>
    Date:   Sat Dec 24 10:19:12 2011 +0100
    
        add new complex number exercises
    
        Add Adding and subtracting complex numbers and Multiplying
        complex numbers.
    MichalPokorny authored beneater committed
Something went wrong with that request. Please try again.