p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,593 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

20593 Commits

Author SHA1 Message Date
Tim Graham 5ebf6fd891 [1.8.x] Fixed #24323 -- Documented @admin.register can't be used with super(XXXAdmin in __init__(). 
Backport of 4cd2bdae07 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 a3a6def867 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 021782d22b 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 53e89ce2e7 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 361f60479d 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 ce531f7ad7 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 2634f606d5 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 de31423130 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 dcd7358afd 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 af95eee9fb 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 6e51d5d0e5 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 4b1416d372 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 c07f9fef39 from master
 2015-09-21 14:00:31 -04:00
Flavio Curella 63147dfa07 [1.8.x] Fixed #25430 -- Fixed incorrect RunSQL examples. 
Backport of 95edabb45e 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 6f1b09bb5c 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 4b9d063da0 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 fc8a6a9b00 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 12a62e7e4b from master
 2015-09-17 15:10:13 -04:00
Stephen Paulger 52c1212726 [1.8.x] Removed unnecessarily rude terminology. 
Backport of 443dffbeb2 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 8615e41586 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 d731cf5caf 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 64d7a553e1 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 c8773493b6.
 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 3fe3887a2e from master
 2015-09-14 14:07:32 -04:00
Ville Skyttä 69017bade0 [1.8.x] Fixed #25393 -- Fixed MySQL crash when adding text/blob field with unhashable default. 
Backport of 4d933ad418 from master
 2015-09-14 12:28:04 -04:00
Kholid Fuadi 07e01dce40 [1.8.x] Fixed typo in django/forms/utils.py docstring. 
Backport of b8b776aabe from master
 2015-09-14 08:50:15 -04:00
Tim Graham 2955dfdeca [1.8.x] Refs #25386 -- Added links to the OPTIONS of the built-in template backends. 
Backport of f3e5a74646 from master
 2015-09-12 18:43:57 -04:00
Markus Holtermann 3cc5cc7958 [1.8.x] Fixed #25384 -- Ordered imports in newly created migration files 2015-09-12 13:23:38 +10:00
Tim Graham 95c00c40ae [1.8.x] Refs #25381 -- Clarified that AppConfig model methods search only the current app. 
Backport of e7e8d30cae from master
 2015-09-11 14:09:15 -04:00
Paul Rentschler c8773493b6 [1.8.x] Fixed #25203 -- Documented how to pass Apache environment variables to Django. 
Backport of 47016d4322 from master
 2015-09-11 13:24:37 -04:00
Renato Oliveira f328ebdede [1.8.x] Fixed #25382 -- Removed obsolete references to DateQuerySet. 
Backport of e3720b990a from master
 2015-09-11 12:21:11 -04:00
Jose Carlos Menezes d32edd8c99 [1.8.x] Fixed #25351 -- Added example for database test settings to docs. 
Backport of cf99bae53a from master
 2015-09-11 08:19:32 -04:00
Flavio Curella 501b32b255 [1.8.x] Fixed #25380 -- Added Postgres.app to the PostGIS options on OS X. 
Backport of 0c7c18cc9e from master
 2015-09-11 08:00:07 -04:00
Daniel Hahler 6c19d81951 [1.8.x] Fixed #25372 -- Fixed autocompletion for options of non-argparse commands. 
Backport of acb833081d from master
 2015-09-09 14:52:33 -04:00
Bibhas 72219d7b32 [1.8.x] Fixed #25371 -- Added reverse_sql and reverse_code examples to docs. 
Backport of 4283a03843 from master
 2015-09-09 14:21:17 -04:00
Aymeric Augustin ce3dd17c2e [1.8.x] Updated references to the TEST_* database settings. 
They were removed in Django 1.9.

I could leave the reference to TEST_DEPENDENCIES in the 1.2.4 release
notes because the link points to the right location and the name was
accurate at the time.

Backport of 6d1110f from master
 2015-09-05 20:31:22 +02:00
Tim Graham 26658ccb0e [1.8.x] Removed some discussion of deprecated {% url %} behavior. 
Backport of dbd8e32f7495fed54203376493f09adc474ebde1 from master
 2015-09-05 11:56:13 -04:00
Maarten c06953e8f9 [1.8.x] Fixed #25355 -- Made two tweaks to docs/topics/db/aggregation.txt. 
Backport of fe58d96e50 from master
 2015-09-05 10:20:36 -04:00
David Sanders e060d57e9a [1.8.x] Added default value for default kwargs for QueryDict. 
Backport of 48c420d992 from master
 2015-09-05 08:23:16 -04:00
Tim Graham 62347208bb [1.8.x] Fixed #24525 -- Fixed AssertionError in some complex queries. 
Thanks Anssi Kääriäinen for providing the solution.

Backport of 2dc9ec5616 from master
 2015-09-05 08:19:38 -04:00
David Sanders f1d6b5b5b1 [1.8.x] Added links to new security settings introduced in 1.8. 
Backport of cc968b9c90 from master
 2015-09-04 12:57:26 -04:00
Tim Graham 20dfd02db0 [1.8.x] Refs #25144 -- Revised deprecation timeline: migrations won't become compulsory. 
Backport of e133b55943 from master
 2015-09-04 09:59:30 -04:00
Maxime Lorant 7dabaa8ee3 [1.8.x] Refs #25345 -- Updated links to code.google.com. 
Backport of c92cd22d02 from master
 2015-09-04 08:18:22 -04:00