Permalink
Commits on Mar 10, 2015
Commits on Mar 8, 2015
  1. Update translatable strings.

    aaugustin committed Mar 8, 2015
  2. Fix flake8 warning.

    aaugustin committed Mar 8, 2015
  3. Move if/else logic for Django 1.8's Template Engine into compat

    Created a few methods that will handle doing the if/else based on
    what's been imported successfully. This cleans up the logic in the
    toolbar itself.
    tim-schilling committed with aaugustin Mar 4, 2015
  4. Include the CacheHandler and caches in compat module.

    Added these to the compat module since they don't exist on versions of django
    earlier than 1.7. The threading and resource modules will continue to have
    the try/except wrappers for the time being since they aren't a versioning incompatibility,
    but a platform issue.
    tim-schilling committed with aaugustin Mar 4, 2015
  5. Create a compat module that will handle django and python version iss…

    …ues.
    
    Moved all simple try/except ImportError cases into the compat module
    tim-schilling committed with aaugustin Mar 4, 2015
Commits on Mar 1, 2015
  1. Fix two flake8 errors.

    aaugustin committed Mar 1, 2015
Commits on Feb 28, 2015
  1. Merge pull request #682 from zborboa-google/patch-1

    Alternate row color on profiling panel
    tim-schilling committed Feb 28, 2015
Commits on Feb 27, 2015
  1. Merge pull request #673 from thedrow/patch-1

    Improved the build process to use docker based works and include Django 1.7 in the tests.
    tim-schilling committed Feb 27, 2015
Commits on Feb 26, 2015
  1. Merge branch 'malthejorgensen-fix-results-cache-size-setting'

    Fix RESULTS_CACHE_SIZE setting. Merged #672.
    tim-schilling committed Feb 26, 2015
  2. Fix RESULTS_CACHE_SIZE setting

    The setting RESULTS_CACHE_SIZE was being ignored, and could not be
    set in any way.
    
    Fixes issue #671 on Github.
    malthejorgensen committed with tim-schilling Feb 26, 2015
  3. Fix errors when running tox locally.

    Using Django>=1.7,<1.8 actually grabbed Django 1.8b. This specifies to
    grab the version of Django that's less than 1.8a which will be the
    latest of 1.7
    tim-schilling committed Feb 26, 2015
Commits on Jan 23, 2015
Commits on Dec 29, 2014
  1. Improved the build process.

    thedrow committed Dec 29, 2014
Commits on Nov 26, 2014
  1. Merge pull request #665 from Matt-Deacalion/master

    Automatically show correct copyright year in documentation
    tim-schilling committed Nov 26, 2014
Commits on Nov 18, 2014
  1. Merge pull request #666 from collinanderson/find_template_loader

    fix find_template_loader move on django 1.8
    aaugustin committed Nov 18, 2014
Commits on Nov 12, 2014
Commits on Nov 11, 2014
  1. Support Django's cached template loader.

    Closes #660
    tim-schilling committed Nov 11, 2014
Commits on Nov 1, 2014
Commits on Oct 25, 2014
  1. Fix infinite recursion bug with template loaders that use SQL.

    Move the get_template_info stacktrace loop into a utility method.
    Check for calls to get_template_context to prevent the infinite recursion.
    
    The bug requires TEMPLATE_DEBUG=True, for the template to extend
    another template and SQL to be run in the template loader.
    With this configuration the SQL Panel would identify the SQL query
    while loading the template, then try to load the template again which
    would create a new SQL query ending in an infinite recursion.
    
    Skip the infinite recursion regression test for Django < 1.5
    
    The test is being skipped because Django 1.4 loads the TEMPLATE_LOADERS
    before override_settings can modify it. This means that the SQL query
    isn't run when loading the template which causes the test to fail.
    
    The other solution would have been to add a conditional setting, but that
    could introduce unexpected results in future tests. Skipping this test is
    the safer, more conservative approach.
    
    Closes #598.
    tim-schilling committed Oct 25, 2014
Commits on Oct 24, 2014
  1. Merge pull request #642 from collinanderson/urls

    Cleaned up urls for Django1.8
    tim-schilling committed Oct 24, 2014