mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-03 21:16:44 +00:00
Code Issues 32 Releases Wiki Activity
20,512 Commits 29 Branches 441 Tags
Commit Graph

20512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mariusz Felisiak
4ec96b776b [1.8.x] Fixed #25503 -- Fixed system check crash on ForeignKey to abstract model. 
Backport of 914167abf19d16ac97c0f1f6ae1b08cb377c8f3a from master
 2015-10-06 19:26:00 -04:00
Tim Graham
9be9c511cc [1.8.x] Fixed #25515 -- Documented the return value of BaseCommand.handle() 
Backport of 3f766d44c5ea000ecf47829ca565b1921dab2ac1 from master
 2015-10-06 15:09:58 -04:00
Riccardo Magliocchetti
e2db171e15 [1.8.x] Refs #12118 -- Allowed "mode=memory" in SQLite test database names. 
Backport of 3543fec3b739864c52de0a116dde3b0e5e885799 from master
 2015-10-06 12:33:24 -04:00
Tim Graham
de570d4da9 [1.8.x] Fixed #25496 -- Made ModelChoiceField respect prefetch_related(). 
Backport of 6afa6818fcf25665bbf61f0921c8c8c6fa8f223e from master
 2015-10-05 19:25:21 -04:00
Tim Graham
bf42888801 [1.8.x] Fixed #25502 -- Added supported Python versions in 1.7, 1.8 release notes. 
Backport of b215a3ab63d1c34746855594656e988561484fe3 from master
 2015-10-05 14:20:11 -04:00
Tim Graham
9c60752ba5 [1.8.x] Added stub release notes for 1.8.6. 
Backport of 58195f0b16999245ada6bd010b71c9c5352ae608 from master
 2015-10-03 19:58:36 -04:00
Tim Graham
ef597580ec [1.8.x] Post-release version bump. 2015-10-03 19:54:05 -04:00
Tim Graham
b35adb0909 [1.8.x] Bumped version for 1.8.5 release. 1.8.5 2015-10-03 19:36:29 -04:00
Tim Graham
badcd2933e [1.8.x] Added release date for 1.8.5. 
Backport of 2eb5589a721488b592ed05d6790d9ad7d2b9dafd from master
 2015-10-03 19:35:22 -04:00
Ben Kraft
c03f0c282d [1.8.x] Fixed #25389 -- Fixed pickling a SimpleLazyObject wrapping a model. 
Pickling a `SimpleLazyObject` wrapping a model did not work correctly; in
particular it did not add the `_django_version` attribute added in 42736ac8.
Now it will handle this and other custom `__reduce__` methods correctly.

Backport of 35355a4ffedb2aeed52d5fe3034380ffc6a438db from master
 2015-10-03 13:03:05 -04:00
Andrew Artajos
29c9a7d220 [1.8.x] Fixed #25398 -- Revised instances of os.path.join() 
Replaced occurrences of os.path.join(BASE_DIR, 'folder/subfolder')
to os.path.join(BASE_DIR, 'folder', 'subfolder')

Backport of d2ef521a53 from master.
 2015-10-03 09:10:26 +02:00
John Moses
a9b6218960 [1.8.x] Fixed #25481 -- Added field.help_text to "Looping over a form's fields" docs. 
Backport of ac09d22f7913ff09f98001ff51b783932290e378 from master
 2015-10-02 13:00:59 -04:00
Nick Williams
2a8988c3b0 [1.8.x] Fixed link to the MySQL Connector/Python Django Backend documentation. 
Backport of 3f342d74e9196da475dd312cf43eaffec13af964 from master
 2015-10-02 12:33:26 -04:00
Marco Fucci
0e2d3b9304 [1.8.x] Fixed #24505 -- Fixed clash with hidden m2m fields. 
Added support for multiple m2m fields with the same 'to' model
and with related_name set to '+'.

Backport of 4ee08958f154594b538207a53c1d457687b3f7ae from master
 2015-09-30 18:38:49 -04:00
David Sanders
07e594bba2 [1.8.x] Clarified that Model.delete() isn't called as a result of a cascading delete. 
Backport of 5c6316dc3467fd7b669bea9157f591ac5fd00ec4 from master
 2015-09-30 08:44:40 -04:00
Tim Graham
f79682eaf2 [1.8.x] Fixed #25485 -- Improved deprecation docs for contenttypes reorganization. 2015-09-29 19:24:59 -04:00
David Sanders
1d22b20f11 [1.8.x] Improved "“standalone” Django usage" example. 
Backport of ae9f9dc37f39afeaa45c646cf6eef81beffcf021 from master
 2015-09-29 15:09:34 -04:00
Tim Graham
f3ce888d3f [1.8.x] Fixed #25376 -- Required virtualenv in installation instructions. 
Thanks Anjul Tyagi for some of the draft text.

Backport of a523d94b4581ec41c86f5bbaaffdf5bb6b819c2e from master
 2015-09-29 14:33:53 -04:00
Tim Graham
e6f1b1db4c [1.8.x] Documented auth's login/logout function parameters. 
Backport of c14b6b52ff131db263bf06a02f903a73390975da from master
 2015-09-28 14:12:43 -04:00
Tim Graham
5ebf6fd891 [1.8.x] Fixed #24323 -- Documented @admin.register can't be used with super(XXXAdmin in __init__(). 
Backport of 4cd2bdae07ac5561fdae0eede58c68df4dfcc780 from master
 2015-09-28 07:26:54 -04:00
Mariusz Felisiak
cb2de5e2e9 [1.8.x] Fixed #25421 -- Fixed test --keepdb option on Oracle. 
Backport of a3a6def867c61d24dfded6cbfef7f820409dc739 from master
 2015-09-26 19:52:09 -04:00
Rob Hudson
4dcd4ef17e [1.8.x] Corrected use of 'affect' vs 'effect' in docs. 
Backport of 021782d22b80ea57fdd5e040add58adeafaedc55 from master
 2015-09-25 18:35:19 -04:00
Tim Graham
2ca137e271 [1.8.x] Fixed #25451 -- Added advice about organizing tests. 
Backport of 53e89ce2e71411ff9d1c3fd6f2b10d052a4aeace from master
 2015-09-25 07:15:54 -04:00
Tim Graham
8794ded8d6 [1.8.x] Removed a prominent note about django.utils.unittest deprecation. 
It doesn't seem this would be relevant to most readers.
 2015-09-24 13:25:43 -04:00
Tim Graham
bb90e8fa2b [1.8.x] Fixed #25455 -- Optimized dictfetchall() example. 
Thanks aklim007 for the suggestion.

Backport of 361f60479d1890e8144fc254d7389a67b35725e9 from master
 2015-09-24 13:18:45 -04:00
Tim Graham
66f50e97d6 [1.8.x] Bumped latest Python 2.7 release in docs/ref/databases.txt. 
Backport of ce531f7ad783facc5799cf43b59b5ce053aa5d9e from master
 2015-09-24 10:57:00 -04:00
Tim Graham
e7064df44f [1.8.x] Fixed #25386 -- Warned about differences between Engine and DjangoTemplates. 
Backport of 2634f606d55b63511ab1c50c4fad2d52fbda1b19 from master
 2015-09-23 19:19:03 -04:00
Benjamin Wohlwend
67896c8561 [1.8.x] Fixed #25453 -- Reworded makemigration's ask_not_null_alteration suggestion. 
Backport of de31423130912a012513aad93ec805f8e08a0d5e from master
 2015-09-23 13:41:01 -04:00
Don Kirkby
1386a823c0 [1.8.x] Fixed typo in docs/topics/db/examples/one_to_one.txt 
Backport of dcd7358afd7985c3803cd8ef2a189ca39aaa9603 from master
 2015-09-23 13:32:01 -04:00
Tim Graham
4a06a904dc Refs #24361 -- Corrected documented level of the 'django' logger. 
The logger doesn't define an explicit level, therefore it defaults
to WARNING.
 2015-09-23 11:21:16 -04:00
Henry Jordan
5add28dad0 [1.8.x] Fixed #25447 -- Emphasized the need to restart dev server when adding template tags. 
Backport of af95eee9fb70dae5b3b2ce8bc73c13fc1de239ff from master
 2015-09-22 19:43:25 -04:00
Rik
55f80d28d4 [1.8.x] Added link to Babel's message extracting functionality. 
Backport of 6e51d5d0e531c6aead9ebd638a63ffdc32245e5a from master
 2015-09-22 08:54:49 -04:00
Aymeric Augustin
76bf4bc111 [1.8.x] Recommended against default_app_config. 
Most likely this is a losing fight -- people seem to love this small
convention -- but at least the reasons for avoiding it will be
documented.

Refs #25356.

Backport of 94a36cf from master
 2015-09-22 08:32:39 +02:00
Tim Graham
528c1330f8 [1.8.x] Added "readded" to the docs wordlist. 
Backport of 4b1416d372c3cf4146855ada9e6444cb6649648e from master
 2015-09-21 17:08:27 -04:00
Aymeric Augustin
425c5e40ea [1.8.x] Fixed #24921 -- set_autocommit(False) + ORM queries. 
This commits lifts the restriction that the outermost atomic block must
be declared with savepoint=False. This restriction was overly cautious.

The logic that makes it safe not to create savepoints for inner blocks
also applies to the outermost block when autocommit is disabled and a
transaction is already active.

This makes it possible to use the ORM after set_autocommit(False).
Previously it didn't work because ORM write operations are protected
with atomic(savepoint=False).

Backport of 91e9f1c from master
 2015-09-21 22:31:13 +02:00
Claude Paroz
158b0a2837 [1.8.x] Fixed #25431 -- Readded inline foreign keys to modelformset instances 
Too much field exclusions in form's construct_instance() in _post_clean()
could lead to some unexpected missing ForeignKey values.
Fixes a regression from 45e049937. Refs #13776.

Backport of 65a1055a3 from master.
 2015-09-21 21:50:11 +02:00
Matt Deacalion Stevens
5023d63f85 [1.8.x] Corrected docstring in core.urlresolvers module. 
The RegexURLResolver.resolve() method no longer returns a tuple.
It has returned a ResolverMatch object since commit e0fb90b2.

Backport of c07f9fef398a21a76d350e8b02b396b3e580b751 from master
 2015-09-21 14:00:31 -04:00
Flavio Curella
63147dfa07 [1.8.x] Fixed #25430 -- Fixed incorrect RunSQL examples. 
Backport of 95edabb45e016ed269f96acc03d4a2bfcecd6b71 from master
 2015-09-19 18:19:38 -04:00
Aymeric Augustin
1abd177696 [1.8.x] Fixed #25160 (again) -- Moved data loss check on reverse relations. 
Moved data loss check when assigning to a reverse one-to-one relation on
an unsaved instance to Model.save(). This is exactly the same change as
e4b813c but for reverse relations.

Backport of c3904de from master
 2015-09-19 20:28:22 +02:00
Mariusz Felisiak
a0ce708c1c [1.8.x] Made assorted improvements to the Oracle documentation. 
Backport of 6f1b09bb5c1bafe4633514cbff37f9a7ed7a63ae from master
 2015-09-18 09:50:35 -04:00
Hynek Cernoch
eb0bbb8f3a [1.8.x] Refs #17785 -- Made docstring for sqlite3's get_relations() consistent with other backends. 
Backport of 4b9d063da05faa112577a4e3cefd020850a25e9e from master
 2015-09-18 09:33:23 -04:00
Aric Coady
7d471fe662 [1.8.x] Refs #20625 -- Fixed custom queryset chaining with values() and values_list(). 2015-09-17 19:20:09 -04:00
Tim Graham
4f0966e75f [1.8.x] Added a version requirement to mysqlclient in test requirements. 
Backport of fc8a6a9b002aef90ff68f3d95e560db1ea728c76 from master
 2015-09-17 15:11:41 -04:00
Tim Graham
120be9b6c0 [1.8.x] Added a version requirement to python-memcached in test requirements. 
Backport of 12a62e7e4b8e6d1136aa4457619449cbbcf9dd7c from master
 2015-09-17 15:10:13 -04:00
Stephen Paulger
52c1212726 [1.8.x] Removed unnecessarily rude terminology. 
Backport of 443dffbeb214da18a0a4204b5295c2b97df418ab from master
 2015-09-16 09:35:37 -04:00
Matthew Crowson
688f8de7b6 [1.8.x] Fixed typo in django/core/cache/backends/base.py docstring. 
Backport of 8615e415861ea93afb5a84365895bd7b9af7be6f from master
 2015-09-16 09:35:14 -04:00
Daniel Hahler
e3bdbac733 [1.8.x] Added upgrade tip in BaseCommand.option_list deprecation comment. 
Backport of d731cf5caf043189fda3708cc0dace5d8f94db6b from master
 2015-09-15 12:08:09 -04:00
Tim Graham
8388f24e79 [1.8.x] Fixed #25369 -- Corrected syndication's get_object() example. 
Backport of 64d7a553e1be20174b0aa2882111049abf392d4f from master
 2015-09-14 15:30:31 -04:00
Tim Graham
d0d2567120 [1.8.x] Reverted "Fixed #25203 -- Documented how to pass Apache environment variables to Django." 
As discussed on the ticket, this isn't a pattern we should recommend.

This reverts commit c8773493b62083b9ca5476a6040737f5cca79944.
 2015-09-14 14:15:20 -04:00
Adam Chainz
3c2c74f58f [1.8.x] Fixed #25377 -- Changed Count queries to execute COUNT(*) instead of COUNT('*'). 
Backport of 3fe3887a2ed94f7b15be769f6d81571031ec5627 from master
 2015-09-14 14:07:32 -04:00