p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,095 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

20095 Commits

Author SHA1 Message Date
Claude Paroz 70c5031d56 [1.8.x] Adapted form regression test to new translations 
Backport of 2112b7d78 from master.
 2015-04-01 19:53:11 +02:00
Tim Graham 5a4f95805f [1.8.x] Refs #24538 -- Simplified a test per Aymeric's feedback. 
Backport of a184a99123 from master
 2015-04-01 13:19:57 -04:00
Tim Graham 5c63c45512 [1.8.x] Fixed #23441, #24555 -- Improved the behavior of InclusionNode. 
This change:

* Makes the InclusionNode cache-safe by removing render-time side effects
  to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
  the render call to use Template.render rather than Nodelist.render.

Backport of 0808ccce38 from master
 2015-04-01 13:12:18 -04:00
Tim Heap ff8eabc5cc [1.8.x] Fixed #24538 -- Allowed self in Jinja context 
Rendering a Jinja template with self in the context threw an error.
While self is a reserved variable in Jinja, including self in the
context is not an error, so Django should respect that.

Backport of 4ea1909d3c from master
 2015-04-01 12:27:52 -04:00
Claude Paroz 5483c66f85 [1.8.x] Fetched updated contrib translations from Transifex 2015-04-01 15:05:29 +02:00
Claude Paroz d1b206daf8 [1.8.x] Fetched updated core translations from Transifex 2015-04-01 14:54:32 +02:00
Claude Paroz 05a781a475 [1.8.x] Removed source strings from translated po files 2015-04-01 14:54:07 +02:00
Markus Holtermann 2218f7617e [1.8.x] Refs #24554 -- Prevented rendering of unused migrations 
Thanks Claude Paroz and Tim Graham for the review

Backport of 3e7d9d05ac from master
 2015-04-01 11:14:55 +02:00
Markus Holtermann 0c7e2833d9 [1.8.x] Fixed #24554 -- Sped up migrations by rendering initial apps when they are first needed 
Calling Migration.mutate_state() now also allows to do in_place
mutations in case an intermediate state is thrown away later.

Thanks Anssi Kääriäinen for the idea, Ryan Hall for parts of the patch,
and Claude Paroz and Tim Graham for the review

Backport of 57dc8dd3fa from master
 2015-04-01 11:14:55 +02:00
Joost Rijneveld 9e9914701a [1.8.x] Fixed typo in docs/ref/templates/builtins.txt 
Backport of 48ddc66219 from master
 2015-03-31 21:21:50 -04:00
Kostochko Dmitriy c2674c2103 [1.8.x] Fixed typo in docs/topics/cache.txt 
Backport of d026eb6366 from master
 2015-03-31 21:16:26 -04:00
Tim Graham 7b9f7b6670 [1.8.x] Fixed sessions test on Python 3.5; refs #23763. 
SimpleCookie.__repr__() changed in
https://hg.python.org/cpython/rev/88e1151e8e02

Backport of 4e59156c10 from master
 2015-03-31 08:41:31 -04:00
Tim Graham 793ecf6db7 [1.8.x] Documented jinja2 install requirement. 
Backport of 56286542db from master
 2015-03-31 07:45:02 -04:00
Andriy Sokolovskiy 121c5f7d5b [1.8.x] Removed duplicate attribute in MySQL DatabaseSchemaEditor. 
Backport of 29b4a3f513 from master
 2015-03-30 19:24:06 -04:00
Jorge Barata González 2bddc74b42 [1.8.x] Fixed #15590 -- Documented how the path of a FileField can be changed. 
Thanks simon29 for report, and freakboy3742, floledermann,
jacob, claudep and collinanderson for discussing the task.

Backport of 931a340f1f from master
 2015-03-30 10:39:14 -04:00
Christopher Luc c4e8f21a9c [1.8.x] Fixed #24281 -- Improved docs for timezone handling for auto_now and auto_now_add 
Thanks djbug for the report and Aymeric Augustin and Carl Meyer for the
review.

Backport of 8119876d4a from master
 2015-03-29 23:38:51 +02:00
Tim Graham c0102dc7ff [1.8.x] Fixed skipping of gis_tests when dependencies not installed. 
Backport of ba1665ed75 from master
 2015-03-28 09:39:49 -04:00
Tim Graham a70dea2c06 [1.8.x] Fixed #24541 -- Clarified ModelFormSet's handling of initial data. 
Backport of 6de3a1e2c3 from master
 2015-03-28 08:59:50 -04:00
Tim Graham b0846a040e [1.8.x] Fixed syntax highlighting in docs/topics/auth/default.txt 
Backport of 3e132406e3 from master
 2015-03-28 07:51:37 -04:00
SaeX 6f69e77a9e [1.8.x] Fixed typo in docs/topics/forms/modelforms.txt 
Backport of 19e41a9799 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 1f2abf784a 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 2acf9d099d 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 f4cc0c40a8 from master
 2015-03-25 18:32:48 -04:00
David Seddon ef61b69447 [1.8.x] Corrected typo in documentation 
Backport of 0f6f80c2e7 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 c633667da3 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 fca14cd3f2 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 74f8110e74 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 23a5d64f40 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 87fed94440 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 127b3873d0 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 53c2cf1e7b from master
 2015-03-21 09:10:01 -04:00
Claude Paroz 8e4b0d6010 [1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling 
Backport of 9e83f30cd3 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 6770b7ecd2 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 8219eabbba from master
 2015-03-20 12:10:18 -04:00
Jon Walsh 2b267a70a1 [1.8.x] Fixed typo in escape_filter() docstring. 
Backport of 8d90489fe0 from master
 2015-03-19 07:22:21 -04:00
Tim Graham e3c9412d86 [1.8.x] Bumped version to 1.8 rc 1. 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 81e1a35c36 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 b4a56ed4f5 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 6bff343989 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 d9a30ed190 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 53d11c6821 from master
 2015-03-17 18:35:51 -04:00