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

21900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Gaevsky
cb96d0c92a [1.9.x] Added a test for adding a UUID pk object using the "Add related" admin popup. 
Follow up to refs #25997 but this case wasn't broken.

Backport of 5052f79df45d843d1e44dcc47152ed503220098f from master
 2016-01-08 18:54:40 -05:00
Alexander Gaevsky
835fff4732 [1.9.x] Refs #24980 -- Fixed incorrect timezone handling in admin calendar widget. 
Backport of ea7542891a4e3638a695c58bd6f00658b7c85985 from master
 2016-01-08 17:22:47 -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
Tim Graham
20c8cc2bf5 [1.9.x] Added a helper function in schema tests. 
Backport of 54d3ba84066301b9cdbbd657620c0f1e5c2422c0 from master
 2016-01-08 14:16:22 -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
2b17ac2469 [1.9.x] Skipped a dateformat test on Windows as needed. 
Refs 1014ba026e879e56e0f265a8d9f54e6f39843348

Backport of 2765adc8dcbaa41662af9000c4de2820418bf0a2 from master
 2016-01-05 13:12:09 -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
775291d4c7 [1.9.x] Fixed #26009 -- Fixed contenttypes_tests isolation. 
Backport of 2c6c873e3fca6c0c54c2335e131f7742fcf2cf26 from master
 2016-01-04 11:48:50 -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
eec6538a74 [1.9.x] Post-release version bump. 2016-01-02 09:01:24 -05:00
Tim Graham
76e0d433c8 [1.9.x] Bumped version for 1.9.1 release. 1.9.1 2016-01-02 08:40:33 -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
Attila Tovt
151027beab [1.9.x] Fixed #26008 -- Added parallel argument to paired_tests and bisect_tests 
Backport of 0db6367fe2aa6ab3fd152eacf172d57db45c1ffb from master
 2016-01-02 05:19:03 -05:00
Tim Graham
5855bee1d1 [1.9.x] Removed British/Austrialian word: whilist. 
Backport of 98839e906632dfe77c6f6906d61d62868a0541dc from master
 2015-12-31 14:31:59 -05:00
Tim Graham
fd830ac8d9 [1.9.x] Fixed #26003 -- Added "how the documentation is organized" sections. 
Thanks Daniele Procida for coauthoring.

Backport of df3d5b1d73699b323aac377dffab039dca26c1e4 from master
 2015-12-31 11:39:50 -05:00
Tim Graham
313d54bd3c [1.9.x] Made cosmetic cleanups in middleware tests. 
Backport of 89616f0c790376867ba31ada27554f40bfeb228e from master
 2015-12-31 10:30:12 -05:00
Claude Paroz
59f3590ca7 [1.9.x] Updated translations from Transifex 2015-12-31 15:51:43 +01:00
Anssi Kääriäinen
99569b22d9 [1.9.x] Fixed #23372 -- Made loaddata faster if it doesn't find any fixtures. 
Django's test suite often tries to load fixture files from apps that have
no fixtures at all. This creates a lot of unnecessary disabling and
enabling of constraints which can be expensive on some database.

To speed this up, loaddata now first checks if any fixture file matches.
If no fixture file is matched, then the command exits before disabling
and enabling of constraints is done.

The main benefit of this change is seen on MSSQL, where tests on
Django 1.8 run hours faster.

Backport of ee9f4686b19e2b4a68f5cb4f9d61dc045c1d4c63 from master
 2015-12-31 09:05:20 -05:00
Marten Kenbeek
b37cb0b958 [1.9.x] Refs #21927 -- Added note about include() to tutorial. 
Backport of 6687f4dcbbfeca81b76233609fca90f30ce4dd25 from master
 2015-12-31 08:21:24 -05:00
Tim Graham
406acd66e3 [1.9.x] Fixed #25748 -- Added clarification on projects vs. applications. 
Thanks Thomas Güttler for motivating this addition.

Backport of e0519301238b43633bab64054772f9a62634a05f from master
 2015-12-30 17:51:11 -05:00
Chris Cogdon
8202ce45a5 [1.9.x] Fixed #26018 -- Prevented unecessary get_form() call in FormMixin.get_context_data(). 
Changed "dict.setdefault" to "if x in dict" pattern so that get_form() would not
be called unnecessarily, specifically in the case where FormMixin.form_invalid()
calls get_context_data() with the current form.

Backport of e429c5186ceed81c4627165518e0c70c58e69595 from master
 2015-12-30 17:30:37 -05:00
Chris Cogdon
4d9b98616f [1.9.x] Fixed #26006 -- Fixed incorrect object reference in SingleObjectMixin.get_context_object_name(). 
Backport of 4b2dcfe04f5d9938e40c569ffdd169f3a712145d from master
 2015-12-30 09:58:05 -05:00
Matthew Madurski
76a96215b9 [1.9.x] Fixed typo in BaseCache.delete_many() docstring. 
Backport of 7df9aa3a33271706bf172eac77b5b0d02c971d77 from master
 2015-12-29 20:50:26 -05:00
Alexander Gaevsky
312e488a21 [1.9.x] Fixed #25465 -- Restored line breaks conversion in admin readonly fields. 
Backport of 69208a5a1c55d42ca0eaffa900be643d9f801089 from master
 2015-12-29 19:37:29 -05:00
knbk
5f3c5e40b2 [1.9.x] Fixed typo in test name. 
Backport of 300de968d680eea10daa00132f60b7db47abfe1d from master
 2015-12-29 12:48:53 -05:00
za
0d6633df93 [1.9.x] Fixed #25104 -- Added httpd.conf hyperlink to modwsgi doc. 
Backport of d9e150b3117521f7c24dc6393eb29eebc3cc376a from master
 2015-12-29 11:02:07 -05:00
Tim Graham
2939ed4a18 [1.9.x] Fixed #23285 -- Fixed non-deterministic admin_views test. 
This test sometimes fail because the checked integers can appear in the
output as memory addresses due to #24316.
 2015-12-28 17:49:45 -05:00
Tim Graham
15af2e806b [1.9.x] Removed an unused import. 2015-12-28 17:46:33 -05:00
Gen1us2k
23cad094f6 [1.9.x] Added docs example for manually creating a column with RunSQL. 
Backport of a1d0c60fa05cbad2e5a25ec37e0afaf1b84c9302 from master
 2015-12-25 18:29:09 -05:00
Varun Sharma
dc1ef0ff2e [1.9.x] Fixed #25984 -- Corrected RuntimeError message in ModelBase.__new__(). 
Backport of 692d05589061a593d4bfbdb2895eaef0386eca34 from master
 2015-12-24 16:45:38 -05:00
Tim Graham
85159b9819 [1.9.x] Refs #13008 -- Forwardported 1.8.8 release note. 
Forwardport of b51086d57313e7ea857f4b96b62d25e600ee0a8d from stable/1.8.x
 2015-12-24 11:38:39 -05:00
Varun Sharma
fa21766230 [1.9.x] Fixed #25959 -- Updated logging example to use the django logger. 
Backport of 483e0091e3891dc4ed898ea0dbf6923c166f0674 from master
 2015-12-24 10:07:56 -05:00
Chris Lamb
47f3ee2625 [1.9.x] Discouraged use of /tmp with predictable names. 
The use of predictable filenames in /tmp often leads to symlink attacks
so remove the most obvious use of them in the docs.

Backport of 77b8d8cb6d6d6345f479c68c4892291c1492ba7e from master
 2015-12-24 09:56:54 -05:00
Luis San Pablo
4f2eb5fc5d [1.9.x] Fixed #25981 -- Added need to update migrations to on_delete deprecation warning. 
Backport of a856555df2a1b4ddad8bf21243de0bcbcc12fb20 from master
 2015-12-24 08:08:51 -05:00
Tomo Otsuka
bc5eed8fb0 [1.9.x] Fixed #25972 -- Restored support for the isnull lookup with ForeignObject. 
Backport of 8b6974a6857bdc48ad50bf21527b840c27648891 from master
 2015-12-24 07:35:08 -05:00