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

8155 Commits

Author SHA1 Message Date
Jacek Bzdak d83454fbf2 [1.8.x] Fixed #25397 -- Documented class-based view context variable clash with context processors. 
Backport of 494b7986a3 from master
 2015-10-23 15:24:18 -04:00
薛丞宏 415837543e [1.8.x] Clarified that the test client response content attribute is bytes. 
Backport of 484edc81c1 from master
 2015-10-23 14:27:15 -04:00
Claude Paroz 244b7c930f [1.8.x] Fixed #25592 -- Fixed misnamed strictly_above PostGIS lookup 
Fixes a regression from 2bd1bbc42. Thanks Daniel Wiesmann for the report
and Tim Graham for the review.
Backport of c08f85fd54 from master.
 2015-10-22 20:35:54 +02:00
Benjamin Wohlwend 840e97ab01 [1.8.x] Refs #24622 -- Documented alternatives to some test response attributes when using alternative template engines. 
Backport of 2b9eed41fa from master
 2015-10-22 14:11:52 -04:00
Tim Graham 6861c2027d [1.8.x] Fixed #21894 -- Corrected a form.clean() example in case a superclass doesn't return data. 
Backport of 80855a4b37 from master
 2015-10-21 13:53:56 -04:00
Jacek Bzdak 3e8234b77e [1.8.x] Fixed #25574 -- Documented {{ dict.items }} shadowing in for template tag docs. 
Backport of 32cd706971 from master
 2015-10-21 11:46:06 -04:00
Simon Charette 71962629c0 [1.8.x] Fixed #25563 -- Cached deferred models in their proxied model's _meta.apps. 
Thanks to Andriy Sokolovskiy for the report and Tim Graham for the review.

Backport of 3db3ab71e9 from master
 2015-10-19 20:13:47 -04:00
Aymeric Augustin 9ccb92ad01 [1.8.x] Fixed #25510 -- Allowed runserver to start with incorrect INSTALLED_APPS. 
In that case, the content of INSTALLED_APPS will be ignored until it's
fixed and the autoreloader kicks in. I confirmed this behavior manually.
As explained on the ticket it's hard to write a test for this case

Backport of df0a446f from master.
 2015-10-19 20:41:48 +02:00
Josh Smeaton 42e029f6c4 [1.8.x] Fixed #25517 -- Made Concat function idempotent on SQLite. 
Backport of 6c95b134e9 from master
 2015-10-17 15:58:17 -04:00
Antoine Catton ee6785ebea [1.8.x] Fixed #25506 -- Allowed filtering over a RawSQL annotation. 
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>

Backport of b971c1cd78 from master
 2015-10-14 12:21:36 -07:00
Sergey Fedoseev 4171d208f4 [1.8.x] Fixed quotes in GeoQuerySet aggregates examples. 
Backport of 92c1ae1b0b from master
 2015-10-13 23:41:22 -04:00
Andriy Sokolovskiy eb85e6672a [1.8.x] Fixed #24156 -- Fixed inherited related name of ManyToManyField. 
Fixed situation when parent abstract model declares related_name='+'
and child models had an invalid queryset.

Backport of f7b2978158 from master
 2015-10-13 04:17:50 -07:00
Claude Paroz 15359f1fe9 Added precision about GeoJSON field outputs 
Backport of 533c10998 from master.
 2015-10-12 21:51:08 +02:00
Tim Graham ae2250507d [1.8.x] Refs #25527 -- Removed redundant doc heading link that leads to a warning when generating PDF. 
Backport of 25f287f6b2 from master
 2015-10-07 19:37:00 -04:00
Mariusz Felisiak 4ec96b776b [1.8.x] Fixed #25503 -- Fixed system check crash on ForeignKey to abstract model. 
Backport of 914167abf1 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 3f766d44c5 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 3543fec3b7 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 6afa6818fc 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 b215a3ab63 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 58195f0b16 from master
 2015-10-03 19:58:36 -04:00
Tim Graham badcd2933e [1.8.x] Added release date for 1.8.5. 
Backport of 2eb5589a72 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 35355a4ffe 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 ac09d22f79 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 3f342d74e9 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 4ee08958f1 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 5c6316dc34 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 ae9f9dc37f 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 a523d94b45 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 c14b6b52ff 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 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
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
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
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
Stephen Paulger 52c1212726 [1.8.x] Removed unnecessarily rude terminology. 
Backport of 443dffbeb2 from master
 2015-09-16 09:35:37 -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
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
David Gibbons 64410a09da [1.8.x] Updated static files howto title to include JavaScript. 
Backport of 526a413870 from master
 2015-09-04 08:08:22 -04:00
Dražen Odobašić 5ed9616a09 [1.8.x] Fixed #25326 -- Added namedtuple example for executing custom SQL. 
Backport of 5ab65ca5c9 from master
 2015-09-03 13:17:34 -04:00
Tim Graham 800a162c0c [1.8.x] Moved misplaced versionadded annotation. 
Backport of 12083c5d47 from master
 2015-09-03 08:58:54 -04:00
Tim Graham 6acf0df862 [1.8.x] Refs #24152 -- Fixed typos in deprecated GeoQuerySet aggregate names. 
Backport of a8eb715b66 from master
 2015-09-02 19:59:27 -04:00
Aymeric Augustin cc14d51ee8 Fixed #24704 -- Made the autoreloader survive SyntaxErrors. 
With this change, it's expected to survive anything except errors
that make it impossible to import the settings. It's too complex
to fallback to a sensible behavior with a broken settings module.

Harcoding things about runserver in ManagementUtility.execute is
atrocious but it's the only way out of the chicken'n'egg problem:
the current implementation of the autoreloader primarily watches
imported Python modules -- and then a few other things that were
bolted on top of this design -- but we want it to kick in even if
the project contains import-time errors and django.setup() fails.

At some point we should throw away this code and replace it by an
off-the-shelf autoreloader that watches the working directory and
re-runs `django-admin runserver` whenever something changes.

Backport of fe6ddb837d from master
 2015-08-29 23:12:08 +02:00
Tim Graham 3cc67a637a [1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor. 
Backport of 9607a04041 from master
 2015-08-28 09:03:34 -04:00
Tim Graham 4f83bfa9e5 [1.8.x] Refs #2495 -- Documented that MySQL cannot have TextField(unique=True). 
Backport of e8cbc2b322 from master
 2015-08-27 09:30:29 -04:00
Tim Graham b7042576f9 [1.8.x] Added 'subtransactions' to spelling wordlist. 
Backport of 91ec1841f5 from master
 2015-08-26 08:24:19 -04:00
Tim Graham 58335a2c0b [1.8.x] Fixed #25311 -- Removed vague language about "partial commits" from docs. 
Backport of ea47a052ba from master
 2015-08-25 20:24:05 -04:00
David Sanders 0723a39a59 [1.8.x] Updated PROJ.4 link to new GitHub wiki. 
Backport of 7efdd40407 from master
 2015-08-25 09:57:34 -04:00
Tim Graham 206534893f [1.8.x] Fixed #25309 -- Corrected that ATOMIC_REQUESTS applies per view not per request. 
Backport of 2a1a085bf1 from master
 2015-08-25 09:54:48 -04:00
Claude Paroz c177d0690e [1.8.x] Fixed #25295 -- Restored 'no active translation' after language override 
Thanks David Nelson Adamec for the report and Tim Graham for the review.
Backport of 9324935c3 from master.
 2015-08-25 10:37:54 +02:00
Kai Richard Koenig 181528726e [1.8.x] Fixed #25040 -- Fixed migrations state crash with GenericForeignKey 
Backport of 60f795c060 from master
 2015-08-22 08:50:19 -04:00
Tim Graham ffe755e990 [1.8.x] Fixed #24951 -- Fixed AssertionError in delete queries involving a foreign/primary key. 
Thanks Anssi Kääriäinen for help.

Backport of 333cbdcd2d from master
 2015-08-20 08:46:08 -04:00
Marc 3fa5229600 [1.8.x] Recommended the JavaScript Cookie library instead of jQuery cookie. 
jQuery cookie is no longer maintained in favor of the JavaScript
cookie library. This also removes the jQuery dependency.

Backport of f9de197268 from master
 2015-08-19 10:05:01 -04:00
Markus Holtermann 79bd15ef32 [1.8.x] Fixed style issues in testing docs 
Backport of f33607ce0b from master
 2015-08-19 21:40:36 +10:00
Tim Graham 63a4384ba1 [1.8.x] Added stub release notes for 1.8.5. 
Backport of 84335e3d1f from master
 2015-08-18 19:53:05 -04:00
Anton Strogonoff a67bf4be35 [1.8.x] Used consistent capitalization and hyphenation of "class-based views" in docs. 
Backport of 20787b5c29 from master
 2015-08-18 19:08:08 -04:00
Tim Graham 2eb86b01d7 [1.8.x] Fixed DoS possiblity in contrib.auth.views.logout() 
Thanks Florian Apolloner and Carl Meyer for review.

This is a security fix.
 2015-08-18 08:15:15 -04:00
Tim Graham 048bccb1be [1.8.x] Added stub release notes for security releases. 2015-08-18 08:15:06 -04:00
Anton Strogonoff e5663ec297 [1.8.x] Limited line length in docs/ref/contrib/messages.txt example. 
Backport of d35f184b20 from master
 2015-08-17 07:48:24 -04:00
Caio Ariede 29fa1b5800 [1.8.x] Fixed #25180 -- Prevented varchar_patterns_ops and text_patterns_ops indexes for ArrayField. 
Backport of dad8434d6f from master
 2015-08-15 10:11:09 -04:00
Tim Graham d2dfe3ae81 [1.8.x] Fixed #25268 -- Tweaked wording in docs/ref/forms/api.txt 
Backport of 5b5a27942b from master
 2015-08-14 08:28:53 -04:00
Adam Brenecki 99b5649a07 [1.8.x] Fixed #24988 -- Documented passing a dictionary of ValidationErrors to ValidationError 
Backport of 52a190b657 from master
 2015-08-13 17:43:06 -04:00
Tim Graham 312abecefd [1.8.x] Corrected indentation of JsonResponse docs. 
Backport of 290145e661 from master
 2015-08-12 10:28:43 -04:00
Tim Graham 77ced0b740 [1.8.x] Updated memcached library links to point to PyPI. 
Backport of d772d812cf from master
 2015-08-11 21:21:24 -04:00
Tim Graham bcf5fb78d7 [1.8.x] Fixed typo in docs/ref/contrib/gis/geoquerysets.txt 
Backport of 56ed80ac2a from master
 2015-08-11 09:33:44 -04:00