django1/django/db/models
Andrew Godwin 588b523233 Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
	django/db/models/options.py
2013-08-09 14:37:37 +01:00
..
fields Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-09 14:17:30 +01:00
sql Fixed #17424 -- annotate() + exclude() bug 2013-08-07 12:53:33 +03:00
__init__.py Fixed #20625 -- Chainable Manager/QuerySet methods. 2013-07-26 12:41:27 +03:00
aggregates.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
base.py Merge branch 'master' into schema-alteration 2013-07-22 19:04:25 +01:00
constants.py Refactored qs.add_q() and utils/tree.py 2013-03-13 10:44:49 +02:00
deletion.py Deprecated SortedDict (replaced with collections.OrderedDict) 2013-08-04 07:09:39 -04:00
expressions.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
loading.py Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-09 14:17:30 +01:00
manager.py Fixed #20826 -- Moved Manager.raw() and Manager._insert() to the QuerySet class. 2013-07-31 09:54:00 -04:00
options.py Merge remote-tracking branch 'core/master' into schema-alteration 2013-08-09 14:37:37 +01:00
query.py Fixed #19918 -- Modified select_for_update to run on the write database. 2013-08-06 09:50:59 -04:00
query_utils.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
related.py A large number of stylistic cleanups across django/db/ 2013-07-08 10:39:54 +10:00
signals.py Rename pre_ and post_syncdb to *_migrate, with aliases from old names 2013-07-30 11:52:52 +01:00