Skip to content
Commits on Oct 4, 2012
  1. @timgraham
Commits on Oct 2, 2012
  1. @freakboy3742
Commits on Sep 28, 2012
  1. @akaariai

    Fixed #18676 -- Allow fast-path deletion of objects

    akaariai committed
    Objects can be fast-path deleted if there are no signals, and there are
    no further cascades. If fast-path is taken, the objects do not need to
    be loaded into memory before deletion.
    
    Thanks to Jeremy Dunck, Simon Charette and Alex Gaynor for reviewing
    the patch.
Commits on Sep 26, 2012
  1. @Fandekasp @claudep
  2. @freakboy3742

    Fixed #3011 -- Added swappable auth.User models.

    freakboy3742 committed
    Thanks to the many people that contributed to the development and review of
    this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
    Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
    and Roger Barnes, as well as the many, many people who have contributed to
    the design discussion around this ticket over many years.
    
    Squashed commit of the following:
    
    commit d84749a
    Merge: 531e771 7c11b1a
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Wed Sep 26 18:37:04 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit 531e771
    Merge: 29d1abb 1f84b04
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Wed Sep 26 07:09:23 2012 +0800
    
        Merged recent trunk changes.
    
    commit 29d1abb
    Merge: 8a527dd 54c81a1
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Sep 24 07:49:46 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit 8a527dd
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Sep 24 07:48:05 2012 +0800
    
        Ensure sequences are reset correctly in the presence of swapped models.
    
    commit e2b6e22
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 23 17:53:05 2012 +0800
    
        Modifications to the handling and docs for auth forms.
    
    commit 98aba85
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 23 15:28:57 2012 +0800
    
        Improved error handling and docs for get_user_model()
    
    commit 0229209
    Merge: 6494bf9 8599f64
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 23 14:50:11 2012 +0800
    
        Merged recent Django trunk changes.
    
    commit 6494bf9
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Sep 17 21:38:44 2012 +0800
    
        Improved validation of swappable model settings.
    
    commit 5a04cde
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Sep 17 07:15:14 2012 +0800
    
        Removed some unused imports.
    
    commit ffd535e
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 20:31:28 2012 +0800
    
        Corrected attribute access on for get_by_natural_key
    
    commit 913e1ac
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 20:12:34 2012 +0800
    
        Added test for proxy model safeguards on swappable models.
    
    commit 280bf19
    Merge: dbb3900 935a863
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 18:16:49 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit dbb3900
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 18:09:27 2012 +0800
    
        Fixes for Python 3 compatibility.
    
    commit dfd7213
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 15:54:30 2012 +0800
    
        Added protection against proxying swapped models.
    
    commit abcb027
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 15:11:10 2012 +0800
    
        Cleanup and documentation of AbstractUser base class.
    
    commit a9491a8
    Merge: fd8bb4e 08bcb4a
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 14:46:49 2012 +0800
    
        Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011
    
    commit fd8bb4e
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 14:20:14 2012 +0800
    
        Documentation improvements coming from community review.
    
    commit b550a6d
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 13:52:47 2012 +0800
    
        Refactored skipIfCustomUser into the contrib.auth tests.
    
    commit 52a02f1
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 13:46:10 2012 +0800
    
        Refactored common 'get' pattern into manager method.
    
    commit b441a6b
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 16 13:41:33 2012 +0800
    
        Added note about backwards incompatible change to admin login messages.
    
    commit 08bcb4a
    Author: Anssi Kääriäinen <akaariai@gmail.com>
    Date:   Sat Sep 15 18:30:33 2012 +0300
    
        Splitted User to AbstractUser and User
    
    commit d9f5e5a
    Author: Anssi Kääriäinen <akaariai@gmail.com>
    Date:   Sat Sep 15 18:30:02 2012 +0300
    
        Reworked REQUIRED_FIELDS + create_user() interaction
    
    commit 579f152
    Merge: 9184972 93e6733
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 15 20:18:37 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit 9184972
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 15 20:18:19 2012 +0800
    
        Deprecate AUTH_PROFILE_MODULE and get_profile().
    
    commit 334cdfc
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 15 20:00:12 2012 +0800
    
        Added release notes for new swappable User feature.
    
    commit 5d7bb22
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 15 19:59:49 2012 +0800
    
        Ensure swapped models can't be queried.
    
    commit 57ac6e3
    Merge: f2ec915 abfba3b
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 15 14:31:54 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit f2ec915
    Merge: 1952656 5e99a3d
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 9 08:29:51 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit 1952656
    Merge: 2c5e833 c4aa26a
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 9 08:22:26 2012 +0800
    
        Merge recent changes from master.
    
    commit 2c5e833
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 9 07:53:46 2012 +0800
    
        Corrected admin_views tests following removal of the email fallback on admin logins.
    
    commit 20d1892
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sun Sep 9 01:00:37 2012 +0800
    
        Added conditional skips for all tests dependent on the default User model
    
    commit 40ea8b8
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 8 23:47:02 2012 +0800
    
        Added documentation for REQUIRED_FIELDS in custom auth.
    
    commit e6aaf65
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Sat Sep 8 23:20:02 2012 +0800
    
        Added first draft of custom User docs.
    
        Thanks to Greg Turner for the initial text.
    
    commit 75118bd
    Author: Thomas Sutton <me@thomas-sutton.id.au>
    Date:   Mon Aug 20 11:17:26 2012 +0800
    
        Admin app should not allow username discovery
    
        The admin app login form should not allow users to discover the username
        associated with an email address.
    
    commit d088b3a
    Author: Thomas Sutton <me@thomas-sutton.id.au>
    Date:   Mon Aug 20 10:32:13 2012 +0800
    
        Admin app login form should use swapped user model
    
    commit 7e82e83
    Merge: e29c010 39aa890
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Fri Sep 7 23:45:03 2012 +0800
    
        Merged master changes.
    
    commit e29c010
    Merge: 8e3fd70 30bdf22
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Aug 20 13:12:57 2012 +0800
    
        Merge remote-tracking branch 'django/master' into t3011
    
    commit 8e3fd70
    Merge: 507bb50 26e0ba0
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Aug 20 13:09:09 2012 +0800
    
        Merged recent changes from trunk.
    
    commit 507bb50
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Jun 4 20:41:37 2012 +0800
    
        Modified auth app so that login with alternate auth app is possible.
    
    commit dabe362
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Jun 4 20:10:51 2012 +0800
    
        Modified auth management commands to handle custom user definitions.
    
    commit 7cc0baf
    Author: Russell Keith-Magee <russell@keith-magee.com>
    Date:   Mon Jun 4 14:17:28 2012 +0800
    
        Added model Meta option for swappable models, and made auth.User a swappable model
Commits on Sep 25, 2012
  1. @ramiro

    Fixed #18072 -- Made more admin links use reverse() instead of hard-c…

    ramiro committed
    …oded relative URLs.
    
    Thanks kmike for the report and initial patch for the changelist->edit
    object view link URL.
    
    Other affected links include the delete object one and object history
    one (in this case the change had been implemented in commit 5a9e127, this
    commit adds admin-quoting of the object PK in a way similar to a222d6e.)
    
    Refs #15294.
Commits on Sep 15, 2012
  1. @jphalip

    Fixed #18530 -- Fixed a small regression in the admin filters where w…

    jphalip committed
    …rongly formatted dates passed as url parameters caused an unhandled ValidationError. Thanks to david for the report.
Commits on Sep 8, 2012
  1. @malcolmt

    Internal refactoring; moving LOOKUP_SEP up one level.

    malcolmt committed
    In an ideal world, nothing except django.db.models.query should have to
    import stuff from django.models.sql.*. A few things were needing to get
    hold of sql.constants.LOOKUP_SEP, so this commit moves it up to
    django.db.models.constants.LOOKUP_SEP.
    
    There are still a couple of places (admin) poking into sql.* to get
    QUERY_TERMS, which is unfortunate, but a slightly different issue and
    harder to adjust.
  2. @tswicegood @jphalip
  3. @tswicegood

    Remove Admin's swallowing of AttributeError (#16655, #18593, #18747)

    tswicegood committed
    During the new-admin changes, catching of AttributeError was added to
    the admin.  This patch removes that as it's no longer possible to add a
    value to a ModelAdmin that is not available.  Adding an attribute that
    can not be called causes an ImproperlyConfigured exception to be raised.
Commits on Aug 29, 2012
  1. @claudep

    Replaced many smart_bytes by force_bytes

    claudep committed
    In all those occurrences, we didn't care about preserving the
    lazy status of the strings, but we really wanted to obtain a
    real bytestring.
Commits on Aug 26, 2012
  1. @ramiro
Commits on Aug 14, 2012
  1. @alex
  2. @claudep

    [py3] Fixed admin_views tests

    claudep committed
    Also changed several occurrences of 'request' to 'response'.
Commits on Aug 12, 2012
  1. @aaugustin

    [py3] Refactored __unicode__ to __str__.

    aaugustin committed
    * Renamed the __unicode__ methods
    * Applied the python_2_unicode_compatible decorator
    * Removed the StrAndUnicode mix-in that is superseded by
      python_2_unicode_compatible
    * Kept the __unicode__ methods in classes that specifically
      test it under Python 2
Commits on Aug 8, 2012
  1. @claudep

    [py3] Fixed 'iterable but non string' detection

    claudep committed
    In Python 3, the str type has an __iter__ attribute. Therefore, the
    presence of an __iter__ attribute is not sufficient to distinguish
    'standard' iterables (list, tuple) from strings.
  2. @alex
Commits on Aug 7, 2012
  1. @aaugustin

    [py3] Ported django.utils.encoding.

    aaugustin committed
    * Renamed smart_unicode to smart_text (but kept the old name under
      Python 2 for backwards compatibility).
    * Renamed smart_str to smart_bytes.
    * Re-introduced smart_str as an alias for smart_text under Python 3
      and smart_bytes under Python 2 (which is backwards compatible).
      Thus smart_str always returns a str objects.
    * Used the new smart_str in a few places where both Python 2 and 3
      want a str.
  2. @aaugustin
Commits on Jul 22, 2012
  1. @aaugustin
  2. @aaugustin
  3. @aaugustin

    [py3] Removed longs.

    aaugustin committed
  4. @aaugustin
  5. @jphalip

    Fixed #10057 -- Ensured that the 'show_delete' context variable in th…

    jphalip committed
    …e admin's change view actually controls the display of the delete button. Thanks to rajeesh for the report, to patcoll for the patch, and to David Gouldin for the test.
Commits on Jul 7, 2012
  1. @jphalip

    Fixed #17978 -- Fixed a minor layout issue when an inline contains a …

    jphalip committed
    …filter horizontal widget. Thanks to Aymeric Augustin for the report.
Commits on Jul 5, 2012
  1. @spookylukey

    Fixed #18572 - Python26 string format incompatibility

    spookylukey committed
    Thanks to anonymous/AeroNotix for the report
Commits on Jul 3, 2012
  1. @spookylukey
  2. @spookylukey

    Removed various unnecessary instances of mark_safe applied to URLs

    spookylukey committed
    Also fixed some test breakages introduced in last commit
  3. @spookylukey
Commits on Jul 2, 2012
  1. @jphalip

    Fixed #18550 -- Ensured that the admin history view works with escape…

    jphalip committed
    …d primary keys.
    
    Thanks to josh.oosterman for the report and patch.
Commits on Jun 18, 2012
  1. @dhepper @apollo13
  2. @dhepper @apollo13
Commits on Jun 17, 2012
  1. @jphalip

    Fixed #18420 -- Prevented the admin JS from crashing when the main fo…

    jphalip committed
    …rm contains no field. Thanks to maciej.maciaszek for the report and patch.
Commits on Jun 16, 2012
  1. @jphalip
  2. @jphalip

    Fixed #18477 -- Fixed colspan value when a TabularInline form contain…

    jphalip committed
    …s validation errors. Thanks to yedpodtrzitko for the report and patch.
Something went wrong with that request. Please try again.