innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
django1/django/db/models
History
Andrew Godwin 7f3678dc4c Merge branch 'master' into schema-alteration 
Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py
 		2013-04-18 17:16:39 +01:00
..
fields Merge branch 'master' into schema-alteration 2013-04-18 17:16:39 +01:00
sql Fixed #14019 -- Initialize `SQLInsertCompiler.return_id` attribute. 2013-04-08 13:41:36 -06:00
__init__.py Fixed #19385 again, now with real code changes 2013-03-24 18:40:40 +02:00
aggregates.py Refactored qs.add_q() and utils/tree.py 2013-03-13 10:44:49 +02:00
base.py Merge branch 'master' into schema-alteration 2013-04-18 17:16:39 +01:00
constants.py Refactored qs.add_q() and utils/tree.py 2013-03-13 10:44:49 +02:00
deletion.py Fixed #19385 again, now with real code changes 2013-03-24 18:40:40 +02:00
expressions.py Refactored qs.add_q() and utils/tree.py 2013-03-13 10:44:49 +02:00
loading.py Merge branch 'master' into schema-alteration 2013-04-18 17:16:39 +01:00
manager.py Fixed #15363 -- Renamed and normalized to `get_queryset` the methods that return a QuerySet. 2013-03-08 10:11:45 -05:00
options.py Merge branch 'master' into schema-alteration 2013-04-18 17:16:39 +01:00
query.py Use `LOOKUP_SEP` in `get_or_create`. 2013-04-18 01:55:12 -04:00
query_utils.py Refactored qs.add_q() and utils/tree.py 2013-03-13 10:44:49 +02:00
related.py Fixed #19385 again, now with real code changes 2013-03-24 18:40:40 +02:00
signals.py Added documentation for the 'db' argument of the post-syncdb signal. 2013-01-03 22:04:55 +01:00