Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
21,738 Commits 26 Branches 382 Tags
Commit Graph

8691 Commits

Author SHA1 Message Date
Claude Paroz
ca6ab72bb7 [1.9.x] Fixed #26138 -- Ensured geometry_field's geometry is always serialized 
Thanks Bernd Schlapsi for the report.
Backport of 54236a2c1c from master.
 2016-01-28 08:52:28 +01:00
Yoong Kang Lim
e47f0c1247 [1.9.x] Fixed #26136 -- Removed URL reversing by dotted path from JavaScript catalog example. 
Backport of 31817dd2eb69db54eb559716aae42fe55ada5fea from master
 2016-01-27 09:05:58 -05:00
Tim Graham
204d31cd60 [1.9.x] Refs #26142 -- Documented that Formset's extra=0 doesn't prevent creating objects. 
Backport of 8e6a08e937272f088902cdbec65a9f2e919783bf from master
 2016-01-27 08:57:17 -05:00
Ben Kraft
dee5896b55 [1.9.x] Fixed #26122 -- Fixed copying a LazyObject 
Shallow copying of `django.utils.functional.LazyObject` or its subclasses has
been broken in a couple of different ways in the past, most recently due to
35355a4.

Backport of 13023ba86746980aace2341ba32a9419e7567751 from master
 2016-01-26 06:57:27 -05:00
Preston Timmons
218cc71073 [1.9.x] Fixed #25848 -- Set template origin on each node. 
Prior to 55f12f8709, the template origin was available on each node via
`self.token.source[0]`. This behavior was removed when debug handling was
simplified, but 3rd-party debugging tools still depend on its presence.
This updates the Parser to set origin on individual nodes. This enables the
source template to be determined even when template extending or including is
used.

Backport of cfda1fa3f8d95f0f4a369da9021dbd770e5fa44a from master
 2016-01-26 06:23:51 -05:00
Simon Charette
abdbf00815 [1.9.x] Fixed #26135 -- Adjusted the migration questioner's handling of disabled apps. 
This was causing an issue when calling the `migrate` command in a test case with
the `available_apps` attribute pointing to an application with migrations
disabled using the `MIGRATION_MODULES` setting.

Thanks to Tim Graham for the review.

Refs #24919

Backport of 4dcaa5871b70859952c6f9c437dfe1b5f10509f2 from master
 2016-01-25 22:02:45 -05:00
Chris Lamb
3306106fb1 [1.9.x] Fixed #25968 -- Changed project/app templates to use a "py-tpl" suffix. 
Debian packages unconditionally byte-compile .py files on installation and
do not silence errors by design. Therefore, we need a way of shipping these
invalid .py files without a .py extension but ensuring that when we
template them, they end up as .py.

We don't special-case .py files so that the all the TemplateCommand
command-line options (eg. extra_files and extensions) still work entirely
as expected and it may even be useful for other formats too.

Backport of abc0777b63057e2ff97eee2ff184356051e14c47 from master
 2016-01-25 12:44:14 -05:00
Tim Graham
20b217b0b0 [1.9.x] Fixed Sphinx highlight warnings in docs. 
Backport of 9c43d8252a926f72be5a279186b42848501819b8 from master
 2016-01-25 12:04:55 -05:00
Tim Graham
4aec49d015 [1.9.x] Refs #26034 -- Added another case fixed by this ticket to release notes. 
Thanks Shai Berger for the report.

Backport of 497b5d6feee5b7947231bd0ae6edf833773b6cce and
5e8685c1b14e94e3f540ac1d68b61e71dcc27517 from master
 2016-01-25 08:36:56 -05:00
Tim Graham
41e059de7c [1.9.x] Fixed #26132 -- Discouraged use of TransactionTestCase.fixtures. 
Backport of b0b45f9a8373f47e96ef6c22d254c984d3b6b3c0 from master
 2016-01-25 06:52:44 -05:00
Tim Graham
5e44348ad7 [1.9.x] Added Django version trove classifier to reusable apps tutorial. 
Backport of 2d36c7d515312e7a476041c96a29727ed47eb517 from master
 2016-01-24 08:37:34 -05:00
Tim Graham
2ef1367426 [1.9.x] Updated Python trove classifiers in reusable apps tutorial. 
Backport of 145e9ca301e6bde965baa88a2e96a1ea0f7d523a from master
 2016-01-23 17:41:21 -05:00
Elif T. Kus
5dceb1f078 [1.9.x] Fixed #26020 -- Normalized header stylings in docs. 
Backport of bca9faae95db2a92e540fbd08505c134639916fe from master
 2016-01-22 12:18:24 -05:00
Tim Graham
647ce33e86 [1.9.x] Fixed #26121 -- Updated MySQL storage engine example. 
default_storage_engine was introduced in MySQL 5.5.3.
storage_engine was removed in MySQL 5.7.5.

Backport of 79d0a4fdb0d13ba6a843dace2b90ab44e856bd85 from master
 2016-01-22 08:22:43 -05:00
Luke Plant
b5c4972283 [1.9.x] Changed action="." to action="" in tests and docs. 
`action="."` strips query parameters from the URL which is not usually what
you want. Copy-paste coding of these examples could lead to difficult to
track down bugs or even data loss if the query parameter was meant to alter
the scope of a form's POST request.

Backport of 77974a684a2e874bccd8bd9e0939ddcb367a8ed2 from master
 2016-01-21 14:00:06 -05:00
Alexander Gaevsky
be3169d6ed [1.9.x] Fixed #26060 -- Fixed crash with reverse OneToOneField in ModelAdmin.readonly_fields. 
Backport of 9a33d3d76497d9e198de942ee1236c452231262f from master
 2016-01-21 13:22:02 -05:00
Aymeric Augustin
cfe4ba6e90 [1.9.x] Fixed #26063 -- Crash when passing > 2000 params. 
If SQLITE_MAX_VARIABLE_NUMBER (default = 999) is changed at compile time
to be greater than SQLITE_MAX_COLUMN (default = 2000), which Debian does
by setting the former to 250000, Django raised an exception on queries
containing more than 2000 parameters when DEBUG = True.

Backport of f91b5a7e4b from master
 2016-01-21 10:48:47 +01:00
Anssi Kääriäinen
05e8fa83c3 [1.9.x] Fixed #26092 -- Fixed QuerySet.order_by() regression with an M2M through model. 
Backport of ee596888e1149864e7828f5cf63c0eda395744c3 from master
 2016-01-20 19:16:18 -05:00
chemary
076d459110 [1.9.x] Fixed #26094 -- Fixed CSRF behind a proxy (settings.USE_X_FORWARDED_PORT=True). 
Backport of 2d28144c9519f4e4397c70f045c2b1d31437bf69 from master
 2016-01-20 18:23:55 -05:00
Tim Graham
f0da306af1 [1.9.x] Fixed #26096, refs #25196 -- Fixed incorrect argument order in test database creation. 
Backport of abcdb237bb313d116ce2ac8e90f79f61429afc70 from master
 2016-01-19 07:07:56 -05:00
auvipy
0911c35678 [1.9.x] Fixed typo in docs/index.txt. 
Backport of 5c048f95cc4a988a35bfd94655469310830a2cf8 from master
 2016-01-18 10:02:01 -05:00
Danilo Bargen
577ec6fcd1 [1.9.x] Added docs about configuring CSRF support in AngularJS. 
Backport of 6a4f13de27e2c46b6e516a01ba77fd4fe03d9dbe from master
 2016-01-15 10:16:57 -05:00
Simon Charette
7ebe378f36 [1.9.x] Fixed a typo in the 1.9.2 release notes. 
Backport of fd1c5bb041abb617dc58c336a8461fb3a7af4508 from master
 2016-01-14 17:47:41 -05:00
Tim Graham
f619b72815 [1.9.x] Fixed #26078 -- Clarified "old vs. new" in model._meta upgrade guide. 
Thanks Thomas Güttler for the suggestion.

Backport of 28acc0d6df844ccfc8de6f4e7d5883eb4841e946 from master
 2016-01-14 07:30:08 -05:00
Alberto Avila
16a52cff32 [1.9.x] Refs #26071 -- Added test for __in lookup in a Case expression. 
Forwardport of 5b3c66d8b64add684489f5010e43de73e7acdd04 from stable/1.8.x
 2016-01-13 08:53:01 -05:00
Tim Graham
12554693e4 [1.9.x] Removed an unncessary docs cross-reference for call_command(). 
Backport of a7752780d9e78e12d0bd7bd2dcf920d304e039bc from master
 2016-01-12 18:02:20 -05:00
Tim Graham
a63b7c479e [1.9.x] Made CommandError use the exception directive in docs. 
Backport of 555f8e9d5c640373d2bd30ec1212b341c859f828 from master
 2016-01-12 12:32:03 -05:00
pp
1cbc556bce [1.9.x] Added missing period to "etc.". 
Backport of b34ff66e5bae3760273255fa5b2525eb21a5eb63 from master
 2016-01-11 18:05:56 -05:00
Simon Charette
27ef6403c8 [1.9.x] Fixed #25858 -- Bound abstract model application relative relationships. 
Thanks to Karl Hobley for the report and Markus, Shai, Aymeric for their input
and Tim for the review.

Backport of bc7d201bdbaeac14a49f51a9ef292d6312b4c45e from master
 2016-01-11 14:08:50 -05:00
pp
76b4015ea9 [1.9.x] Refs #25755 -- Unified a couple more spellings of 'website'. 
Backport of c8d970a548cb5cbdad80dbb1b5b4e44ff08662b5 from master
 2016-01-11 06:16:49 -05:00
bmsleight
577ea02977 [1.9.x] Fixed a typo in a modelforms docs example. 
Backport of 8715205c5c0e49b21b5bbea35d904713ee188a71 from master
 2016-01-09 13:04:51 -05:00
Tim Graham
3503b816cf [1.9.x] Refs #25995 -- Documented that JSONField doesn't handle sophisticated serialization. 
Backport of c432dd40bde37667bfe6bb59eaff0a14c50cd27b from master
 2016-01-08 19:59:14 -05:00
Tim Graham
3d324b9614 [1.9.x] Fixed #26034 -- Fixed incorrect index handling on PostgreSQL on Char/TextField with unique=True and db_index=True. 
Thanks Simon Charette for review.

Backport of 56aaae58a746eb39d5e92ba60f59f4c750a8e1a8 from master
 2016-01-08 14:20:53 -05:00
Alexander Gaevsky
a839d71d85 [1.9.x] Fixed #25997 -- Removed redundant escaping in admin's edit related model popup. 2016-01-08 11:06:56 -05:00
Tim Graham
f42ab40b73 [1.9.x] Fixed #26055 -- Removed an orphaned phrase in docs/howto/deployment/wsgi/modwsgi.txt. 
Backport of db8f462494d603eba922818479a87f5ddfe1a13b from master
 2016-01-08 09:37:32 -05:00
wingston sharon
abcf3fe684 [1.9.x] Fixed #25928 -- Clarified precendence of USE_THOUSAND_SEPARATOR and locale formats. 
Backport of 7f218d98915ef3e76a98ef72075a6bde907dfe41 from master
 2016-01-07 14:32:38 -05:00
Alexander Gaevsky
18bf062af9 [1.9.x] Fixed #24980 -- Fixed day determination in admin calendar widget. 
Backport of 44930cc4667268c20493d7e97387db2a97d61a26 from master
 2016-01-07 11:14:05 -05:00
Claude Paroz
fe6d5689f2 [1.9.x] Fixed #26046 -- Fixed a crash with translations and Django-unknown language code 
Thanks Jens Lundstrom for the report and Tim Graham for the review.
Backport of 632a9f21bc from master.
 2016-01-06 20:33:26 +01:00
Scott Pashley
a7b69c8657 [1.9.x] Fixed #26035 -- Prevented user-tools from appearing on admin logout page. 
Backport of 7cc2efc2d6916c05a0a5cb0c0e67f5405d8f6a03 from master
 2016-01-06 13:52:25 -05:00
Tim Graham
c74b1b408a [1.9.x] Refs #25878 -- Added the expected return type of CSRF_FAILURE_VIEW. 
Backport of 62e83c71d2086b91d58c313e46933ef7aa8b6db1 from master
 2016-01-06 07:10:34 -05:00
Tim Graham
00a9854ca9 [1.9.x] Added stub release notes for 1.8.9. 
Backport of 1e57dccb31b1302c7292dfa7eac8d8aeeb76a7d0 from master
 2016-01-05 13:19:44 -05:00
Tim Graham
35fd2a6fd5 [1.9.x] Fixed #25878 -- Documented requirement that handler404 return a 404 response. 
Backport of 49eeb0f570c91af5064d9e4ac8649e9afa0236ec from master
 2016-01-05 12:46:06 -05:00
Denis Cornehl
ee2835e69c [1.9.x] Fixed #26024 -- Fixed regression in ConditionalGetMiddleware ETag support. 
Backport of 186b6c61bfe85afa4d6bf213d04a28dd2853fed2 from master
 2016-01-05 09:41:13 -05:00
Tim Graham
0a72ad3952 [1.9.x] Fixed #26032 -- Moved "project root directory" to a separate paragraph. 
Backport of b07f91600d61a2f8d58adb4c92d36dd0b2b34fe7 from master
 2016-01-04 10:55:30 -05:00
Jarek Glowacki
6e5d77dc05 [1.9.x] Added missing step to transitioning squashed migrations. 
Backport of d8b651a544696e586bcc941335420ff9b7bf4fb5 from master
 2016-01-04 10:38:43 -05:00
Mahendra Yadav
d86870cb6c [1.9.x] Added a missing import in tutorial 3. 
Backport of e8c34bb832e88a3dec8c5f3f687bbbf62afb857c from master
 2016-01-02 09:39:42 -05:00
Tim Graham
237f72c9fe [1.9.x] Added stub release notes for 1.9.2. 
Backport of 3432f5d659bf926c96a7ede3304a4fda2bfea77d from master
 2016-01-02 09:06:54 -05:00
Tim Graham
b8cd834b5d [1.9.x] Added release date for 1.9.1/1.8.8 releases. 
Backport of 24c1713e2ec29214838be61cc6bf13b6bf380f4f from master
 2016-01-02 08:36:30 -05:00
varunnaganathan
5770c2382a [1.9.x] Fixed #25316 -- Fixed a crash with order_by() and values() after annotate(). 
Backport of 3eba9638ee69138c73efb1d1c1d1b806ddafc6cf from master
 2016-01-02 08:19:41 -05:00
Tim Graham
2f4be218e1 [1.9.x] Fixed #26016 -- Restored contrib.auth hashers compatibility with py-bcrypt. 
Reverted "Explicitly passed rounds as rounds to bcrypt.gensalt()"

This reverts commit 23529fb19594ffcc6ba6d716356b828157200288.

Backport of f0ad641628a3ddc4e1c208e481b9cd0e9304dc3d from master
 2016-01-02 06:55:29 -05:00