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

21875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Graham
b0303803d6 [1.9.x] Removed an extra header in docs/ref/templates/api.txt. 
Backport of 91cd4d8e8c1e8593fc091abc11e05fa5d9514601 from master
 2015-12-23 19:05:35 -05:00
Alasdair Nicol
326efed9ee [1.9.x] Refs #25963 -- Fixed typo in docs/topics/http/shortcuts.txt 
Backport of 28d05a4c195e2e01cdbc1435d58b44ece5ccc170 from master
 2015-12-23 18:36:07 -05:00
Alasdair Nicol
8eeb01a702 [1.9.x] Fixed #25854 -- Removed deprecated usage of template.render() with RequestContext in docs. 
Backport of 32c7d93e5f0638c5a1ec8e2525c967be444fcef1 from master
 2015-12-23 18:31:20 -05:00
Tim Graham
dac48234d3 [1.9.x] Fixed #25729 -- Fixed flaky admin_widgets selenium test: test_ForeignKey_using_to_field 
Backport of 5081adcb9004f2c726dcfd054f7f16c5fd39d391 from master
 2015-12-23 14:02:07 -05:00
Tim Graham
d162b0bcd8 [1.9.x] Fixed #25969 -- Replaced render_to_response() with render() in docs examples. 
Backport of 4d83b0163e15f8352fd17fa121e929842ff2b686 from master
 2015-12-23 10:50:55 -05:00
Tim Graham
2f205e073b [1.9.x] Refs #25969 -- Replaced usage of render_to_response() with render() in tests. 
Backport of edf3b88f1ad8f6e900fb3273cc8a573d3d77ce16 from master
 2015-12-23 10:23:41 -05:00
Sergey Fedoseev
91c976b64b [1.9.x] Documented that GDAL is required to initialize GEOSGeometry from JSON. 
Backport of febe1321dac489e2e9dc30b6a67ee3b623e0b735 from master
 2015-12-23 07:58:36 -05:00
Tim Graham
c0d8d5f98c [1.9.x] Fixed #25948 -- Added guidelines for SimpleTestCase.assertRaisesMessage() usage. 
Backport of 77f50c9cfc8b33bf86394816cde183e656ba28cd from master
 2015-12-23 07:31:14 -05:00
Sergey Fedoseev
3f04850f82 [1.9.x] Refs #25141 -- Removed note that says that GEOSGeometry.json requires GDAL. 
Backport of 0224f1cb042cc14545369b230cf7036af6c296ab from master
 2015-12-23 07:28:14 -05:00
Mads Jensen
3bcd42d343 [1.9.x] Fixed #25936 -- Added showmigrations to migrations topic guide. 
Backport of 394e59099c89eb82cf4a37c78ab5f329b76ce0cc from master
 2015-12-22 13:17:27 -05:00
Tim Graham
36d0aa4303 [1.9.x] Fixed #25963 -- Clarified render_to_response() context_instance deprecation. 2015-12-22 13:06:22 -05:00
Tim Graham
923a4fb20a [1.9.x] Fixed #25965 -- Added removal of sql* commands to 1.9 release notes. 
Backport of d52b0c5b38cce633a75420a703a15f03aabd70dd from master
 2015-12-22 13:00:24 -05:00
Tim Graham
c80d85d4ad [1.9.x] Fixed #25903 -- Fixed the admin's list_editable add/change buttons. 
Backport of f18b08748abaecb171fdcbcdfdcd7e4d95d931d1 from master
 2015-12-21 09:30:39 -05:00
Alex Gaynor
40fd217437 [1.9.x] Removed a misleading comment about HTTPS. 
For all practical purposes, there are no common cases for which a
website cannot be deployed with HTTPS.

Backport of d7580e286ac9c48e410d59281720205d6f5dda10 from master
 2015-12-21 06:52:49 -05:00
Tim Graham
a80fb8ae24 [1.9.x] Fixed #25922 -- Fixed migrate --fake-initial detection of many-to-many tables. 
Backport of fa9ce4e9a691e4f8c8b093784bac752e488dc60b from master
 2015-12-19 13:50:06 -05:00
Tim Graham
571f7b759e [1.9.x] Fixed #25949 -- Documented Psycopg2 version requirement for JSONField. 
Backport of b26d147259202455ce356755b729c3dcb16ae9e6 from master
 2015-12-19 07:25:28 -05:00
Aymeric Augustin
24ebf17f04 [1.9.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 df0a446fd4c864c003e4f941b5b7abd6f10c9427 from master
 2015-12-18 19:08:28 -05:00
Claude Paroz
f0a4ff2b11 [1.9.x] Fixed #25915 -- Allowed language not in Django's default LANGUAGES 
This fixes a regression introduced by a5f6cbce07.
Thanks Gavin Wahl for the report and Tim Graham for the review.
Backport of cd3c042b0 from master.
 2015-12-18 17:51:52 +01:00
Sergey Fedoseev
12b0d070d9 [1.9.x] Fixed a typo in docs/ref/contrib/gis/geos.txt. 
Backport of e09007076138d71d9605c4acd94acdf29cbc87e7 from master
 2015-12-18 07:09:27 -05:00
Sergey Fedoseev
14146f6347 [1.9.x] Refs #25894 -- Fixed evaluation of zero-length slices of QuerySet.values() on Oracle. 
Backport of ed1bcf05158acf4bf4e0189d477b6c762bd0133e from master
 2015-12-17 17:07:54 -05:00
Sven Grunewaldt
badeb56f83 [1.9.x] Fixed #25845 -- Fixed incorrect timezone warnings in custom admin templates. 
Backport of 9af40f5df13801ffadcc5ded7440e4616123959f from master
 2015-12-17 14:35:40 -05:00
Claude Paroz
ff077cd649 [1.9.x] Fixed #25942 -- Fixed TypedChoiceField.has_changed with nullable field 
This fixes a regression introduced by 871440361.
Backport of d91cc25a2a from master.
 2015-12-17 15:39:34 +01:00
Garrison Benson
54295a95d9 [1.9.x] Refs #13110 -- Fixed typo in Feed class reference. 
Backport of 2ec23a3d41be2ba5df9f46b17e0a05eb1b051c41 from master
 2015-12-17 09:09:53 -05:00
Simon Charette
c4c72ade6f [1.9.x] Fixed #25852 -- Made sure AlterModelManager forces a reload of its model state. 
Thanks to Geoffrey Sechter and the Django NYC group for the report and Markus
for the review.

Backport of c4e372aaf467ae41315cfe56a718a80469fc5318 from master
 2015-12-15 14:53:45 -05:00
Tim Graham
ea63cf8d42 [1.9.x] Refs #10060 -- Corrected description of multiple annotations bug. 
Backport of 3d2236773ba88e330841b8c72183b0e978e10909 from master
 2015-12-15 08:04:43 -05:00