mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-18 22:33:44 +00:00
Code Issues 32 Releases Wiki Activity
20,276 Commits 29 Branches 430 Tags
Commit Graph

20276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SaeX
6f69e77a9e [1.8.x] Fixed typo in docs/topics/forms/modelforms.txt 
Backport of 19e41a9799079ddae3ba94f95d25577ab4232037 from master
 2015-03-28 07:40:54 -04:00
Moritz Sichert
44a05a8a91 [1.8.x] Fixed #24469 -- Refined escaping of Django's form elements in non-Django templates. 
Backport of 1f2abf784a9fe550959de242d91963b2ad6f7e9c from master
 2015-03-27 20:01:41 -04:00
Tim Graham
6a2f46f238 [1.8.x] Fixed #24519 -- Clarified location of templates directory in tutorial 2. 
Backport of 2acf9d099d29f45c829ee0127e55b7cfdd201995 from master
 2015-03-27 09:58:44 -04:00
Tim Graham
17c3a26ac2 [1.8.x] Added some missing newlines in docs/ref/validators.txt. 
Backport of f4cc0c40a85a8cbba6d2e4cd3158070dfd8645a2 from master
 2015-03-25 18:32:48 -04:00
David Seddon
ef61b69447 [1.8.x] Corrected typo in documentation 
Backport of 0f6f80c2e7736ec4e2aa40287fe8c37ffff0a783 from master
 2015-03-25 13:44:13 -04:00
Tim Graham
0dc986d1c8 [1.8.x] Fixed #24361 -- Clarified docs on reconfiguring logging. 
Thanks Tuttle for the report and draft patch, and Carl Meyer for
help and review.

Backport of c633667da3605208ea5fc137f5322c599f48da69 from master
 2015-03-24 12:26:25 -04:00
Tim Graham
b81ce2ed67 [1.8.x] Fixed #24532 -- Restored fallback support for allow_syncdb. 2015-03-24 10:33:50 -04:00
Matt Seymour
09933aef68 [1.8.x] Fixed #24501 -- Improved auth.decorators.user_passes_test() example. 
Backport of fca14cd3f27a01f7ba1fe32ea9587fa75b85713a from master
 2015-03-24 10:30:30 -04:00
Varun Sharma
8f5e8ab666 [1.8.x] Added test for LogEntry.get_edited_object(); refs #24244. 
Backport of 74f8110e74927c231bfcd106fa28bf6e6dd034e6 from master
 2015-03-23 08:52:32 -04:00
Bas Peschier
015a9b928a [1.8.x] Fixed #13525 -- Added tests and docs for nested parameters in URL patterns. 
When reversing, only outer parameters are used if captured parameters are
nested. Added tests to check the edge cases and documentation for the
behavior with an example to avoid it.

Backport of 23a5d64f40b0f4a3fbfef7427ca793cb1df1034e from master
 2015-03-23 08:43:58 -04:00
Tim Graham
ce6062dbd9 [1.8.x] Fixed backport of refs #24485 tests. 2015-03-22 16:14:15 -04:00
Iacopo Spalletti
6da4ce5365 [1.8.x] Fixed #23814 -- Pointed localflavor documentation to external package 
Edited localflavor doc to point to the external package documentation,
leaving just the 'How to migrate' section in Django.

Backport of 87fed9444033533ad7105c4b1e4ffc5d7854a2c6 from master.
 2015-03-22 15:36:44 +01:00
Josh Smeaton
e654123f7f Fixed #24485 -- Allowed combined expressions to set output_field 2015-03-22 17:41:12 +11:00
Josh Smeaton
3a1886d111 [1.8.x] Fixed #24508 -- Made annotations commutative 
Backport of 127b3873d03704f77428b984de022664b268314e from master
 2015-03-22 17:35:22 +11:00
Pakal
dc2cff5fcb [1.8.x] Fixed #24500 -- Fixed makemessages encoding problems retrieving gettext version. 
Backport of 53c2cf1e7b3f1c9a7794fcc5c4669145f351b2fa from master
 2015-03-21 09:10:01 -04:00
Claude Paroz
8e4b0d6010 [1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling 
Backport of 9e83f30cd31 from master.
 2015-03-21 10:29:22 +01:00
David Seddon
744d9a10ef [1.8.x] Refs #14645 -- Documented bug with exclude() and multi-value relations 
Backport of 6770b7ecd208a0746f181e54202fb829460c6490 from master
 2015-03-20 17:51:57 -04:00
Claude Paroz
5da3153d56 [1.8.x] Fixed #23520 -- Explained that custom plural forms should be avoided 
Thanks aruseni for the report.
Backport of 556eb67701 from master.
 2015-03-20 20:46:02 +01:00
Tim Graham
5cd551409e [1.8.x] Fixed #24503 -- Added docs on LANGUAGE_CODE fallback change in 1.8. 
Thanks Pakal and Claude.

Backport of 8219eabbba6e8f6d8569792615935011b5cf0771 from master
 2015-03-20 12:10:18 -04:00
Jon Walsh
2b267a70a1 [1.8.x] Fixed typo in escape_filter() docstring. 
Backport of 8d90489fe0049049f1f13c737ac51a24abf1efc3 from master
 2015-03-19 07:22:21 -04:00
Tim Graham
e3c9412d86 [1.8.x] Bumped version to 1.8 rc 1. 1.8c1 2015-03-18 19:23:22 -04:00
Tim Graham
770427c289 [1.8.x] Made is_safe_url() reject URLs that start with control characters. 
This is a security fix; disclosure to follow shortly.
 2015-03-18 19:23:21 -04:00
Tim Graham
5447709a57 [1.8.x] Fixed an infinite loop possibility in strip_tags(). 
This is a security fix; disclosure to follow shortly.
 2015-03-18 19:23:21 -04:00
Tim Graham
5a8ef2a3cf [1.8.x] Added stub release notes for security releases. 2015-03-18 19:23:21 -04:00
Karl Hobley
a8c53041f9 [1.8.x] Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed. 
Backport of 81e1a35c364e5353d2bf99368ad30a4184fbb653 from master
 2015-03-18 19:12:46 -04:00
Tim Graham
247251c2e1 [1.8.x] Refs #24483 -- Added a test for deconstruction of Field.choices 
Backport of b4a56ed4f55502239cb11b57f0fa75baa0a97640 from master
 2015-03-18 13:56:33 -04:00
Moritz Sichert
571e093a25 [1.8.x] Refs #24469 -- Fixed escaping of forms, fields, and media in non-Django templates. 
Backport of 6bff3439894ac22d80f270f36513fc86586273f3 from master
 2015-03-18 09:11:44 -04:00
Claude Paroz
1cd2584c98 [1.8.x] Updated translation catalogs 
Strings are frozen in anticipation of the Django 1.8 release.
 2015-03-18 09:29:12 +01:00
Claude Paroz
1bb712d79c [1.8.x] Removed translations from contrib.messages 
The only one translatable string will be handled in the core catalog.
 2015-03-18 09:28:28 +01:00
Tim Graham
4cc501205d [1.8.x] Updated location of database backend data_types attribute in docs. 
Backport of d9a30ed190d68a5450cba8b3cd26ef6bcd8a70ff from master
 2015-03-17 20:04:30 -04:00
Tim Graham
0c92913bb0 [1.8.x] Updated links to latest version of PostGIS docs. 
Backport of 53d11c6821b7b347e0eeefb96168cc1861715a6b from master
 2015-03-17 18:35:51 -04:00
Tim Graham
ddb95d6d53 [1.8.x] Refs #24487 -- Added upgrade tips about removal of SortedDict. 
Thanks Pascal Chambon for the initial patch.

Backport of c5c8751147d41913a05e86097ea29ccc9fc2e5be from master
 2015-03-17 13:42:54 -04:00
Tim Graham
717bbd473c [1.8.x] Updated location of gis_tests in docs. 
Backport of 64b9393ae279fde1ac535348458b3ff960177225 from master
 2015-03-17 11:35:41 -04:00
Josh Smeaton
a0cebe82b5 [1.8.x] Refs #24485 -- Renamed some expression types 
Backport of 88d798d71a20662bdf5335f0586fb9eb6e660c57 from master
 2015-03-17 08:40:45 -04:00
Josh Smeaton
34e09e532d [1.8.x] Fixed #24486 -- Fixed error with datetime and DurationField arithmetic 
Backport of ff2aa4019259947734c4791d6afc9f5405d901d0 from master
 2015-03-17 08:36:15 -04:00
John Giannelos
e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging. 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master
 2015-03-16 19:45:55 -04:00
Marten Kenbeek
febcbbf89d [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1. 
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.

Backport of 818182b514d1c6b379130c440689355b4d231d49 from master
 2015-03-16 13:31:22 -04:00
Preston Timmons
ff71d6b8de [1.8.x] Documented Context.get() method. 
Backport of 4d9414098bd98aacd241827a01f6ad2dff71f113 from master
 2015-03-16 13:13:47 -04:00
Josh Smeaton
09062e9509 [1.8.x] Fixed #24486 -- Documented method to provide output_field to mixed F expressions 
Backport of 820381d38bc02ea8b92837ce869e7332a7db9913 from master
 2015-03-16 11:56:09 -04:00
Adrian Andreias
63b998a653 [1.8.x] Fixed allow_migrate() signature in router examples. 
Backport of 937643a1f215d7d2063b256269d757a2ee316f07 from master
 2015-03-16 09:39:41 -04:00
HerHde
6dcbfc0700 [1.8.x] Added missing punctuation in some comments in tutorial 5. 
Backport of 39573a11db694a584de6ca2a858fa05ec4ea13e1 from master
 2015-03-16 08:24:58 -04:00
Steven Das
f2db113f51 [1.8.x] Added comma to improve readability in 1.7 release notes. 
Backport of 4f494ed0c60cdfc44b65aeea7f42f6b7245c03af from master
 2015-03-16 08:17:01 -04:00
Matthew Wilkes
22a67d22e9 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 
Forwardport of test and release note from stable/1.7.x

Backport of ae87ad005f7b62f5fa5a29ef07443fa1bbb9baf0 from master
 2015-03-14 15:47:10 -04:00
Tim Graham
da8b3aa7eb [1.8.x] Fixed #24480 -- Marked strings in contrib.gis templates for translation. 
Backport of 21ffbb06ec9eb741f62ac51abab4b722fb91b9bc from master
 2015-03-14 15:20:53 -04:00
Floris den Hengst
bd36f2d432 [1.8.x] Fixed doc typos. 
Backport of e42a720ba22a51c68d2316d425234a197eaff467 from master
 2015-03-14 12:29:27 -04:00
Tim Graham
5b91802718 [1.8.x] Refs #24462 -- Emphasized that order_by() clears previous ordering. 
Backport of b9d9ab23bdcc404708aada664e718a9d56415ca3 from master
 2015-03-13 15:42:03 -04:00
Andrei Kulakov
937c8a5a14 [1.8.x] Fixed #24052 -- Doc'd how to write data migrations with models in multiple apps. 
Backport of b089759d6025582f36fbea3c4be3855c50b82462 from master
 2015-03-13 13:24:18 -04:00
Sævar Öfjörð Magnússon
8fe451d183 [1.8.x] Fixed #24478 -- Added NUMBER_GROUPING value for Icelandic 
Backport of d8de9a64d7 from master.
 2015-03-13 16:57:37 +01:00
Claude Paroz
f115694547 [1.8.x] Documented gdal DataSource encoding parameter 
Thanks Max Demars for the suggestion and Tim Graham for the review.
Backport of a8991b9b9f1 from master.
 2015-03-13 16:41:37 +01:00
Remco Kranenburg
6f555e54f7 [1.8.x] Refs #23559 -- warned about consequences of letting users edit User model in admin. 
Backport of f6b09a7f85c3b67b2011553838b079788c413432 from master
 2015-03-13 08:51:24 -04:00