Permalink
Commits on Apr 28, 2015
  1. Merge pull request #3573 from MCGallaspy/installer-link-update

    Update windows installer link in docs
    committed Apr 28, 2015
  2. Update link

    MCGallaspy committed Apr 28, 2015
  3. update version.py to 0.13.1.

    aronasorman committed Apr 28, 2015
  4. Merge pull request #3566 from jamalex/hotfix_langpack_updates

    Hotfix: Factor in software version when checking whether a langpack is new.
    committed Apr 28, 2015
Commits on Apr 27, 2015
  1. Merge branch '0.13.x' to master.

    Conflicts:
    	kalite/distributed/static/js/distributed/software-keyboard.js
    	kalite/version.py
    aronasorman committed Apr 27, 2015
  2. Merge pull request #3564 from rtibbles/subtitle_fix

    Allow subtitle_urls through the TastyPie firewall
    aronasorman committed Apr 27, 2015
Commits on Apr 23, 2015
  1. Merge pull request #3547 from jamalex/clear_reg_status_in_session

    Delete the reg state from session post-reg to reload on next pageload.
    aronasorman committed Apr 23, 2015
Commits on Apr 22, 2015
  1. remove the tests for file download.

    I give up. On 0.13.x, import_all_child_modules still lives on, which
    makes importing anything under fle_utils/internet *automatically* import
    Django, which we don't need and certainly won't run! I can't think of
    any way around this other than doing a lot of refactoring, which
    violates the code freeze. Either way, this test lives on in develop.
    aronasorman committed Apr 22, 2015
Commits on Apr 21, 2015
  1. concatenate the download path and filename for videos properly.

    Fixes #3500. Before, we just concatenated them by strings. This fails when the
    content dir passed in doesn't have a trailing slash ('/content') which
    happens some of the time. Now, we use the smarts in os.path.join to
    handle the concatenating for us.
    
    This bug doesn't appear often (as we often pass 'content/', with
    trailing slash), but something with Xhosa triggers content to be passed
    without the trailing slash, hence failing to place videos on the right directory.
    
    Conflicts:
    	python-packages/fle_utils/videos.py
    aronasorman committed Apr 21, 2015
Commits on Apr 16, 2015
  1. use the toplevel leq url, not pantry.

    the pantry doesn't have https, that's why.
    aronasorman committed Apr 16, 2015
  2. open the file in binary mode, not the zipfile.

    Or else error ensues.
    aronasorman committed Apr 16, 2015
  3. open our assessment zipfile in binary mode.

    Not doing so causes this to fail on Windows, which probably reads things
    differently from Unix systems.
    aronasorman committed Apr 16, 2015
Commits on Apr 15, 2015
  1. raise status for unsuccessful zip download.

    Or else the code may move forward despite having a bad zipfile, and thus
    getting a BadZipFile error.
    aronasorman committed Apr 15, 2015
  2. Merge pull request #3514 from jamalex/0.13-fixes

    Test and fix for regression error on SyncedModel.full_clean(imported=True)
    MCGallaspy committed Apr 15, 2015
Commits on Apr 14, 2015
  1. Merge pull request #3520 from MCGallaspy/docs-fix-installguide-img

    Add some styling to an image
    MCGallaspy committed Apr 14, 2015
  2. Add some styling to an image

    MCGallaspy committed Apr 14, 2015
Commits on Apr 13, 2015
  1. Merge pull request #3504 from MCGallaspy/django-check-messages-fix-0.13

    Handle case where num_messages is 0 on 0.13.x
    aronasorman committed Apr 13, 2015
Commits on Apr 12, 2015
Commits on Apr 10, 2015
  1. Merge pull request #3509 from aronasorman/delete-old-knowledgemap-images

    delete power-mode images.
    66eli77 committed Apr 10, 2015
  2. delete power-mode images.

    They seem to be used for the old knowledge map, which doesn't exist for 0.13.
    aronasorman committed Apr 10, 2015
  3. Merge pull request #3506 from EdDixon/0.13.x

    Unrelated failure. We'll look at that test in a separate PR. Merging.
    MCGallaspy committed Apr 10, 2015
Commits on Apr 9, 2015
  1. Merge pull request #3496 from jamalex/fix_the_evil_bug_that_spoke_sof…

    …tly_and_carried_a_big_stick
    
    Fixes #2470: "Cant register because Client device must be self-signed with a signature matching its own public key"
    committed Apr 9, 2015