Skip to content
This repository

Apr 24, 2014

  1. Jack Toole

    substate kas / subkas

    authored April 24, 2014
  2. Jascha Sohl-Dickstein

    move header text addition to problem-template.handlebar

    Summary: This is the companion commit to http://phabricator.khanacademy.org/D8419 which makes header text appear for both Perseus and old style exercises.  It removes the code from khan-exercise.js which added psych. intervention header text, since headers are now added in problem-template.handlebar instead.
    
    Test Plan: ran on local dev_appserver
    
    Reviewers: colinfuller, mattfaus, alpert
    
    Reviewed By: alpert
    
    Subscribers: benjaminhaley, jace
    
    Differential Revision: http://phabricator.khanacademy.org/D8501
  3. Ben Eater

    Allow shading the area under a graphie-plotted function

    Summary: Shading a parametric equation perhaps doesn't make a ton of sense by itself, but maybe it'll be useful.
    
    Test Plan:
    In graphie-to-png:
    
    ```
    plot(function(x) {
        // Function to shade under
        return 0.03 * (x+5)*(x+2)*(x-3)*(x-6);
    }, [-5, 3], // <-- x-range to shade
        false, true, { stroke: BLUE, fill: BLUE, opacity: 0.3 }
    );
    
    plot(function(x) {
        // Plot the entire function
        return 0.03 * (x+5)*(x+2)*(x-3)*(x-6);
    }, X_RANGE);
    ```
    
    Reviewers: jack
    
    Reviewed By: jack
    
    Subscribers: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D8116
    authored April 23, 2014

Apr 23, 2014

  1. Ben Eater

    Keep the points in front!

    I find it hard to believe I didn't catch this earlier...
    
    Test Plan:
    1. Load graphing_inequalities.html and graphing_inequalities_2.html in local mode.
    2. Drag a point.
    3. See https://s3.amazonaws.com/uploads.hipchat.com/6574/49847/XZzptRZSBkqtTAz/upload.png instead of https://s3.amazonaws.com/uploads.hipchat.com/6574/49847/jsNjObFKhW6nAHd/upload.png
    
    Auditors: jack
    authored April 23, 2014
  2. Ben Eater

    Merge pull request #161346 from pjmattingly/master

    Updated khan-exercise to fix dependencies in 'congruency' utility
    authored April 22, 2014

Apr 22, 2014

  1. Jack Toole

    Remove semicolon from requirejs.config.js

    The semicolon in requirejs.config.js from
    706493c was causing r.js to not
    understand this configuration file.
    
    Test Plan: substate and make sure jenkins starts working again
    
    Auditors: tom
    authored April 22, 2014
  2. Marcia Lee

    Switch taskId back to task_id

    Summary:
    The client was changed from task_id to taskId in http://phabricator.khanacademy.org/D8297,
    the server was changed to accept both task_id or taskId in http://phabricator.khanacademy.org/rGWcde63d08f3b2e03b4234e5b83201610cfaa8cb2a
    
    And now we're changing the client from taskId back to the original task_id!
    In a short while, I'll change the server back to only accept task_id, as before.
    
    Going to add a Perseus person in case this affects you in some way! Lucky Jack!
    
    Reviewers: mgp, jack, benkomalo, laura
    
    Reviewed By: benkomalo, laura
    
    Differential Revision: http://phabricator.khanacademy.org/D8423
    authored April 22, 2014

Apr 21, 2014

  1. pjmattingly

    updated khan-exercise to fix dependencies in 'congruency' to add 'gra…

    …phie-helpers' (more details in pull request)
    authored April 21, 2014
  2. Jack Toole

    Merge pull request #161344 from mauk81/html

    fix html
    authored April 21, 2014
  3. Jack Toole

    Merge pull request #161332 from mauk81/jslint

    jslint
    authored April 21, 2014
  4. Jack Toole

    Merge pull request #161345 from mauk81/patch-6

    correct common denominator for hints, fix #156905
    authored April 21, 2014

Apr 20, 2014

  1. maik

    correct common denominator for hints, fix #156905

    authored April 20, 2014

Apr 18, 2014

  1. maik

    escape special character

    authored April 19, 2014
  2. maik

    fix html

    authored April 19, 2014
  3. Marcos Ojeda

    fixes lint error for global oauth var in interface.js

    summary: oauth is defined only for specific projects that include it in the global namespace to perform authenticated calls to the api. In this case, interface.js assumed that webview-bridge was available and was setting the `oauth` object in the global namespace, but this isn't always the case so the linter complained.
    
    test plan: rebuilt ipad app and successfully saw a 200 OK when posting to /attempt
    
    auditors: laura, ben
    authored April 18, 2014
  4. Justin Jaffray

    Add `var` to fraction - fix lint

    Test Plan:
    N/A
    
    Auditors: brianmerlob
    authored April 18, 2014
  5. Brian Merlob

    Change getFormat to getNumericFormat for clarity

    Test Plan: should still work
    
    Auditors: jack
    authored April 17, 2014
  6. Jack Toole

    Merge pull request #161342 from mauk81/html

    fix html
    authored April 18, 2014
  7. maik

    fix html

    authored April 18, 2014

Apr 17, 2014

  1. Laura Savino

    Make sure oauth ajax requests from exercises are going to ka.org

    Summary: We'd tried appending https://ka.org in $.ajax beforeStart, but since that happens after oauth is set up, authentication failed. This adds ka.org to the requested URL if the URL is missing a domain and is trying to access the API (without this change, it defaulted to the window's location protocol, which is file:// in the iOS app).
    
    Test Plan: Logged in & did exercises in the iOS & web apps; progress posted to the server successfully!
    
    Reviewers: mgp, ben
    
    Reviewed By: ben
    
    Subscribers: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D8321
    authored April 17, 2014
  2. Laura Savino

    Add kaOauthAjax call (so mobile web view can send authenticated reque…

    …sts without cookies)
    
    Summary: The iOS web view doesn't set cookies, so we need to handle authentication via oauth. If the oauth library is included, we'll use that mechanism to make the API request; otherwise, this returns the $.ajax request that was used before.
    
    Test Plan: Do some exercises while logged into the iOS & web apps; advancement works!
    
    Reviewers: mgp, ben
    
    Reviewed By: ben
    
    Subscribers: marcos, alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D8300
    authored April 16, 2014
  3. Laura Savino

    Make sure LocalStore exists before trying to access it for the scratc…

    …hpads
    
    Summary:
    This section assumes a LocalStore is set up, which isn't currently true on the iOS app (and may not be in the future, either).
    
    Checking its existence before accessing it avoids an exception.
    
    Test Plan: Ran khan-exercises in both the iOS and web apps; scratchpads work in the web still, and the iOS app doesn't throw an exception there.
    
    Reviewers: mgp, ben
    
    Reviewed By: mgp, ben
    
    Subscribers: marcos
    
    Differential Revision: http://phabricator.khanacademy.org/D8295
    authored April 16, 2014
  4. Laura Savino

    Use Exercises.getTaskId() function in interface.js to find learning t…

    …ask ID with no learning task
    
    Summary: The iOS web view doesn't have a learningTask on the Exercises object, so couldn't post that parameter back to the server on making an exercise attempt. Since it only needs the taskId, I'm creating a function on the iOS Exercises object that just returns that piece. For now, to make minimal changes to the web app, I'm leaving the current structure in place and just adding this additional path to the data we need to complete the request.
    
    Test Plan: Do some exercises on the iOS app and in the web app and make sure they advance to the next one and handle attempts appropriately.
    
    Reviewers: mgp, ben
    
    Reviewed By: mgp, ben
    
    Differential Revision: http://phabricator.khanacademy.org/D8297
    authored April 16, 2014

Apr 16, 2014

  1. Jascha Sohl-Dickstein

    log subhint usage

    Summary: Added code to log when subhints are clicked on and expanded.  This will be used in the header text intervention experiment to see when users interact with dropdown text.  This will not work without the corresponding webapp checkin, at http://phabricator.khanacademy.org/D6914 .
    
    Test Plan: Ran it on local appserver.
    
    Reviewers: jace, alpert, eliana
    
    Reviewed By: alpert, eliana
    
    Subscribers: alpert, mattfisher, mattfaus
    
    Differential Revision: http://phabricator.khanacademy.org/D6913

Apr 15, 2014

  1. Ben Eater

    Use PRETTY instead of POTATO

    I'm apparently bad at this...
    
    Test Plan: none
    
    Auditors: peter
    authored April 14, 2014
  2. Ben Eater

    Use POTATO instead of BETTER

    BETTER has two sets of letters that repeat :(
    
    Test Plan: /exercises/permutations_and_combinations_2.html?debug&problem=letters&seed=94
    
    Auditors: peter
    authored April 14, 2014

Apr 14, 2014

  1. Brian Merlob

    Deprecating the answer format percentage

    I forgot we were deprecating this.
    
    Test Plan: never used, no need to test
    authored April 14, 2014
  2. Brian Merlob

    Add getFormat(text) - returns format (string) of given text

    It's purposively more inclusive than answer-types' predicate.forms, but more for sake of brevity than necessity. Optimally, I could just tap into answer-types' predicate.forms, go through each one in some order and return the key if it matches. It might also be wise to do it the other way, have several function in KhanUtil for isMixed(text), isInteger(text), isDecimal(text) accounting for commas/spaces/badLeadingZeros, etc. and then having those functions called from inside answer-types.
    
    If you have strong feelings against this, lemme know
    
    Test Plan: Try "1", "1/2", "3/2", "1 1/2", "1 3/2", "1.3", "1,3", "3 1,3.4" (deliberate, if not foolish), "pi", "topic", "topau", "topau%"
    
    Auditors: eater, jack
    authored April 14, 2014
  3. Brian Merlob

    Delete default for toNumericString

    Now pi will turn into 3.1415926..., but NumberInput will (hopefully) soon have a dynamically set format, making this ok.
    
    Test Plan: none
    
    Auditors: jack
    authored April 13, 2014

Apr 13, 2014

  1. maik

    remove extra comma

    authored April 14, 2014
  2. maik

    Merge remote-tracking branch 'upstream/master' into jslint

    authored April 14, 2014

Apr 11, 2014

  1. Peter Collingridge

    Swap orange for pink

    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D8132
  2. Peter Collingridge

    Make sentence nicer

    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D8133
  3. Peter Collingridge

    Add back missing sentence and tweak colour code

    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D8131
  4. Peter Collingridge

    Remove plusTrim code dealing with leading coefficients

    Summary: Simplify colours
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D8136
Something went wrong with that request. Please try again.