p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
20,020 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

20020 Commits

Author SHA1 Message Date
Dan Fellin 9f39715509 [1.8.x] Fixed typo in docs/topics/forms/modelforms.txt. 
Backport of 6ff826e12e from master
 2015-03-11 19:58:14 -04:00
Sean Wang e0e2df412f [1.8.x] Fixed #24414 -- Added examples of Prefetch object usage to the docs. 
Backport of a3e89f13df from master
 2015-03-11 12:39:50 -04:00
Preston Timmons 2982143dac [1.8.x] Fixed typo in current_app deprecation note. 
Backport of 6b605be5fe from master
 2015-03-11 12:36:08 -04:00
Tim Graham aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter. 
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.

Backport of 7b1a67cce5 from master
 2015-03-10 19:12:20 -04:00
Claude Paroz 12e199356e [1.8.x] Fixed download instructions for cities shapefile 
Thanks Daniel Wiesmann for spotting the issue.
Backport of 57d42aef97 from master.
 2015-03-10 19:44:27 +01:00
Claude Paroz e2816f1ff9 [1.8.x] Updated GIS docs wrt GIS test paths 
Backport of 1825365152 from master.
 2015-03-10 18:01:29 +01:00
Erik Romijn 846a970106 [1.8.x] Fixed #23903 -- Configured Sphinx to autogenerate django-admin manpage 
Backport of f66c2bdc0f from master
 2015-03-10 08:15:40 -04:00
Calvin Jeong 6e81786f92 [1.8.x] Fixed typo in docs/ref/database.txt 
Backport of cefbbb9db3 from master
 2015-03-10 07:12:39 -04:00
Psilo Cybin b25e542ecd [1.8.x] Fixed #24456 -- Added links to topics/forms/modelforms.txt. 
Backport of 866e71140f from master
 2015-03-09 20:53:05 -04:00
Floris den Hengst 9853844ed3 [1.8.x] Fixed #24432 -- Added docs for ManyToManyFields that reside in and refer to the same model. 
Backport of b9b8411129 from master
 2015-03-09 20:46:26 -04:00
Tim Graham ffa4ff5e8c [1.8.x] Added stub release notes for 1.7.7. 
Backport of ea9157f681 from master
 2015-03-09 13:10:09 -04:00
Tim Graham 449d1effb8 [1.8.x] Bumped version to 1.8 beta 2. 2015-03-09 10:22:51 -04:00
Baptiste Mispelon 35d68e8e76 [1.8.x] Refs #24461 -- Added test/release notes for XSS issue in ModelAdmin.readonly_fields 
This issue was fixed by refs #24464.
 2015-03-09 10:15:12 -04:00
Tim Graham 980d604bf2 [1.8.x] Clarified an item in 1.7.6 release notes. 
Backport of 300fdbbebb from master
 2015-03-09 10:11:44 -04:00
Erik Romijn d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape their input by default. 
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.

Thanks Markus Holtermann for help with tests and docs.

Backport of fa350e2f30 from master
 2015-03-09 09:31:07 -04:00
Anssi Kääriäinen 3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions 
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c4 from master
 2015-03-09 07:51:05 -04:00
Tim Graham 83269b2935 [1.8.x] Fixed typo in docs/howto/custom-template-tags.txt 
Backport of 63f2dd4ad7 from master
 2015-03-09 07:06:32 -04:00
Rik 930fc4db7b [1.8.x] Fixed #21661 -- Expanded authentication views documentation 
Backport of eb9b7abb83 from master.
 2015-03-08 20:40:33 +01:00
Aymeric Augustin 311b880fa9 [1.8.x] Prevented some tests from writing in the CWD. 
Backport of 90b069c33f from master
 2015-03-07 10:40:17 -05:00
Jean-Louis Fuchs 1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns 
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060fea from master
 2015-03-07 14:15:27 +01:00
Claude Paroz ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings 
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
 2015-03-06 22:22:51 +01:00
Josh Smeaton 823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions 
Backport of ceaf31adff from master
 2015-03-06 13:31:43 +11:00
Marten Kenbeek bd7c879d5a [1.8.x] Stressed authentication should be successful before logging in a user. 
Backport of 8e744fa150 from master
 2015-03-05 12:18:13 -05:00
Aymeric Augustin 2bef57f3fb [1.8.x] Improved get_media_prefix template tag example. 
Backport of 9a4a9a8a49 from master
 2015-03-05 10:00:05 -05:00
Benjamin Wohlwend 3bc35f7e08 [1.8.x] Moved definition of chunks out of timesince function. 
This speeds up the timesince function/filter substantially.

Backport of d6969ab from master.
 2015-03-04 22:31:27 +01:00
Tim Graham 20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False. 
Backport of 36a17be9f3 from master
 2015-03-04 13:56:51 -05:00
Tim Graham 4fa61e0e4f [1.8.x] Used format_html() in contrib.admin.utils for consistency. 
Backport of fe42bfaaff from master
 2015-03-04 10:44:44 -05:00
Markus Holtermann bff446c205 [1.8.x] Fixed #24435 -- Prevented m2m field removal and addition in migrations when changing blank 
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.

Backport of a9e29fae10 from master
 2015-03-04 15:44:38 +01:00
Mathias André 44dd65fb2c [1.8.x] Removed outdated docstring for get_admin_url(). 
Since a4b8a4b632 the admin
URL returned by get_admin_url() is no longer relative to
the Django admin index page.

Backport of 85757d0e79 from master
 2015-03-03 07:47:32 -05:00
Ross Brunton 72539a5f29 [1.8.x] Fixed #24379 -- Documented that remote user example disables ModelBackend. 
Backport of 6b28e957df from master
 2015-03-02 19:57:12 -05:00
Tim Graham cc525e31bb [1.8.x] Fixed #13015 -- Clarified language about model instances attached to forms. 
Backport of a40a34a4b2 from master
 2015-03-02 18:45:27 -05:00
Andrew Pinkham ac6bc2c090 [1.8.x] Fixed #24439 -- Removed incorrect make_object_list attributes in CBV docs. 
Backport of fea45eff5a from master
 2015-03-02 13:33:42 -05:00
Ian Lee ed25758556 [1.8.x] Added syntax highlighting for apache code blocks 
Backport of fde4857fb8 from master
 2015-03-02 12:37:07 -05:00
Brent O'Connor 761b97c344 [1.8.x] Updated contributing link in the README. 
Backport of f7bf135f62 from master
 2015-03-02 08:23:52 -05:00
Claude Paroz c0df8d1be9 [1.8.x] Fixed #24413 -- Prevented translation fallback for English 
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
Backport of 3cf1c02695 from master.
 2015-02-28 10:09:01 +01:00
Alex Shaindlin 5a3b59370c [1.8.x] Improved wording in tutorial 1. 
Backport of dcdef1fe2e from master
 2015-02-27 17:54:27 -05:00
Claude Paroz b825ec38c1 [1.8.x] Fixed #24418 -- Prevented crash in refresh_from_db with null fk 
Thanks Johannes Lerch for the report, Tim Graham for the test case,
and Simon Charette for the review.
Backport of 5cf96b49e4 from master.
 2015-02-27 20:25:12 +01:00
Tim Graham 9d6f0dce13 [1.8.x] Fixed #24359 -- Cleaned up docs/ref/exceptions.html 
Backport of 2b19b3a031 from master
 2015-02-27 13:51:29 -05:00
Tim Graham 31a1f96bd3 [1.8.x] Added stub release notes for 1.7.6. 
Backport of 71820721a1 from master
 2015-02-25 09:11:43 -05:00
Tim Graham a9ab8bd4dd [1.8.x] Added release date for 1.7.5 release. 
Backport of aca73737da from master
 2015-02-25 09:03:38 -05:00
Tim Graham b8f9fd7591 [1.8.x] Updated trove classifier to beta. 2015-02-25 08:29:14 -05:00
Tim Graham 3fff408a27 [1.8.x] Bumped version to 1.8 beta 1. 2015-02-25 08:26:23 -05:00
Tim Graham dfcdf64d47 [1.8.x] Fixed #24411 -- Avoided dict key/method clash in admin delete views. 
Backport of 47b35b1844 from master
 2015-02-25 08:07:25 -05:00
Michael Angeletti 278b698794 [1.8.x] Fixed #24391 -- Made BoundField.value() cache callable values. 
Backport of 65441bbdb0 from master
 2015-02-24 20:05:16 -05:00
Tim Graham 81911f29b7 [1.8.x] Reverted "Fixed #24325 -- Documented change in ModelForm.save() foreign key access." 
This reverts commit 0af3822dc3.
It's obsoleted by refs #24395.

Backport of d298b1ba50 from master
 2015-02-24 11:51:10 -05:00
Stanislas Guerra a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance. 
Backport of 4c2f546b55 from master
 2015-02-24 11:49:27 -05:00
Preston Timmons 450b42eafe [1.8.x] Cleaned up template directory handling in template tests. 
Backport of 8e129b42ad from master
 2015-02-24 09:22:25 -05:00
Preston Timmons b22d20dd18 [1.8.x] Combined TemplateTests and TemplateRegressionTests. 
Backport of 32c108a221 from master
 2015-02-24 09:22:20 -05:00
Preston Timmons 2e7414cdf4 [1.8.x] Moved test_token_smart_split into ParserTests. 
Backport of 25a0b5cdcd from master
 2015-02-24 09:22:15 -05:00
Preston Timmons e15292daa0 [1.8.x] Moved ifchanged tests into syntax_tests/test_if_changed.py. 
Backport of 3d8fee6051 from master
 2015-02-24 09:22:05 -05:00