Permalink
Commits on May 3, 2012
  1. @trbs

    Merge pull request #207 from stj/master

    Modelviz fix graph generic relations
    trbs committed May 3, 2012
Commits on May 2, 2012
  1. Fix wrong indentation level for elif

    Stefan Tjarks committed May 2, 2012
Commits on Apr 26, 2012
  1. @trbs

    Merge pull request #205 from TrueCar/master

    Updated to encrypted fields to truncate if necessary before encryption
    trbs committed Apr 26, 2012
  2. Truncate encrypted fields before writting to database to ensure field…

    …s are readable when read back
    Ted Schundler committed Apr 26, 2012
  3. Truncate encrypted fields before writting to database to ensure field…

    …s are readable when read back
    Ted Schundler committed Apr 26, 2012
Commits on Apr 25, 2012
  1. @trbs

    Merge pull request #187 from bmihelac/fix-186

    Fix #186 - find_template management command does not work
    trbs committed Apr 25, 2012
  2. @trbs

    Merge pull request #201 from dhepper/master

    Change JSONField to allow empty lists
    trbs committed Apr 25, 2012
  3. @trbs

    Merge pull request #200 from ltvolks/master

    Fix failure in python 2.6 when using "shell_plus --print-sql"
    trbs committed Apr 25, 2012
Commits on Apr 24, 2012
  1. @trbs

    ticket #203 make sure INSTALLED_APPS is cohersed into a list and rese…

    …t the original INSTALLED_APPS on teardown
    trbs committed Apr 24, 2012
Commits on Apr 23, 2012
  1. @trbs

    ticket #202, werkzeug link 404'd replaces by generic link to werkzeug…

    … and pip install instructions
    trbs committed with x Apr 23, 2012
Commits on Apr 22, 2012
  1. @ltvolks

    Merge branch 'master' of github.com:django-extensions/django-extensions

    * 'master' of github.com:django-extensions/django-extensions:
      Removed redundant code (was checking if statifiles app was installed, but this was already checked before)
      runprofileserver can now uses the staticfiles app (code copied from runserver_plus)
    ltvolks committed Apr 22, 2012
  2. @ltvolks

    Merge branch 'master' of github.com:ltvolks/django-extensions

    * 'master' of github.com:ltvolks/django-extensions:
      Fix failure in python 2.6 when using "shell_plus --print-sql"
    
    Conflicts:
    	django_extensions/management/commands/shell_plus.py
    ltvolks committed Apr 22, 2012
  3. @ltvolks

    Fix failure in python 2.6 when using "shell_plus --print-sql"

    Change introduced in [15c81cd] to display sql execution time relies on a method of datetime.timedelta introduced in python 2.7 (total_seconds). Using time.time() is simpler and backwards compatible.
    ltvolks committed Apr 21, 2012
Commits on Apr 21, 2012
  1. @dhepper
  2. @trbs

    Merge pull request #199 from yassam/master

    runprofileserver can now use staticfiles app
    trbs committed Apr 21, 2012
  3. @ltvolks

    Fix failure in python 2.6 when using "shell_plus --print-sql"

    Change introduced in [15c81cd] to display sql execution time relies on a method of datetime.timedelta introduced in python 2.7 (total_seconds). Using time.time() is simpler and backwards compatible.
    ltvolks committed Apr 21, 2012
Commits on Apr 19, 2012
  1. @yassam

    Removed redundant code (was checking if statifiles app was installed,…

    … but this was already checked before)
    yassam committed Apr 19, 2012
Commits on Apr 18, 2012
  1. @trbs

    Merge pull request #198 from ciciliati/patch-1

    Fixed issue with models containing self-relationships.
    trbs committed Apr 18, 2012
  2. @ciciliati
  3. @ciciliati
Commits on Apr 16, 2012
  1. @yassam
Commits on Apr 11, 2012
  1. @trbs

    Merge pull request #197 from digitalpbk/patch-2

    ADMIN_MEDIA_PREFIX is deprecated in django 1.4
    trbs committed Apr 11, 2012
  2. @digitalpbk
Commits on Apr 10, 2012
  1. @trbs

    Merge pull request #195 from dexterbt1/master

    Fix for issue #189
    trbs committed Apr 10, 2012
Commits on Apr 9, 2012
  1. @dexterbt1
Commits on Apr 4, 2012
  1. @trbs

    github issue 160 changed filepaths to not include colons and close th…

    …e profiler before renaming files (breaks on windows)
    trbs committed with x Apr 4, 2012
Commits on Mar 25, 2012
  1. GH Issue #190 Fix UnboundLocalError

    x committed Mar 25, 2012
  2. ignore .pyo files

    x committed Mar 25, 2012
Commits on Mar 23, 2012
  1. @trbs
Commits on Mar 22, 2012
  1. @bmihelac

    Fix #186

    find_template management command does not work
    
    Django does not find_template does not return origin, see:
    https://code.djangoproject.com/ticket/17199
    bmihelac committed Mar 22, 2012
Commits on Mar 20, 2012
Commits on Mar 12, 2012
  1. @trbs

    Merge pull request #184 from msabramo/issue-182

    Fix screenshot URLs to point to */media*/assets/...
    trbs committed Mar 12, 2012
  2. @msabramo
Commits on Mar 8, 2012
  1. @trbs

    Merge pull request #173 from gwrtheyrn/master

    Display execution time after query
    trbs committed Mar 8, 2012