mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
15,576 Commits 30 Branches 460 Tags
985d0865a3cfb5850f926dfd9742fa7a9ca88bdc
Commit Graph

15576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
fac5735a3d [1.6.x] Fixed #20557 -- Properly decoded non-ASCII cookies on Python 3. 
Thanks mitsuhiko for the report.

Non-ASCII values are supported. Non-ASCII keys still aren't, because the
current parser mangles them. That's another bug.

Simplified backport of 8aaca651 and f5add47 from master.
 2013-09-07 10:45:24 -05:00
Aymeric Augustin
f855058c35 [1.6.x] Fixed #11811 -- Data-loss bug in queryset.update. 
It's now forbidden to call queryset.update(field=instance) when instance
hasn't been saved to the database ie. instance.pk is None.

Conflicts:
	tests/queries/tests.py

Backport of b4cd8169 from master.
 2013-09-06 21:59:28 -05:00
Russell Keith-Magee
2a2ac5c140 Merge pull request #1566 from adamsc64/ticket_11857 
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.

Backport of 926bc42 from trunk.
 2013-09-06 19:44:25 -05:00
Tim Graham
6ba01f64c1 [1.6.x] Fixed Python 3 syntax error introduced in [c72392da] 
Backport of 498014ccd5 from master
 2013-09-06 20:08:56 -04:00
Russell Keith-Magee
3df9647ad9 [1.6.x] Merge pull request #1582 from rca/12756-missing-yaml-module-serializer-error-message 
Fixed #12756: Improved error message when yaml module is missing.

Backport of 4f5faa1916 from master.
 2013-09-06 19:01:24 -05:00
Russell Keith-Magee
99952bab30 [1.6.x] Merge pull request #1580 from ianawilson/ticket_16502 
Fixed #16502 -- Fixed a TemplateDoesNotExist error that should be an ImproperlyConfigured.

Assistance on the patch from #jambronrose.

Backport of 9b2dc12b83 from master.
 2013-09-06 17:39:16 -05:00
Russell Keith-Magee
b917458f47 Merge pull request #1579 from ianawilson/ticket_21058 
[1.6.x] Fixed #21058 -- Fixed debug view blowing up when no template is provided to the template rendering functions.

Assistance on this commit from @jambonrose.

Backport of 122020fdb9 from master.
 2013-09-06 17:11:07 -05:00
Tim Graham
2ab2d0fb25 [1.6.x] Fixed a link in topics/testing/overview.txt 
Backport of 0c295a7718 from master
 2013-09-06 17:41:43 -04:00
Max Burstein
92e89452f1 [1.6.x] Fixed #21049 -- Fixed autoreload for Python 3 
Changed th system module values check to return a list.
In Python 3 it returns a dict_view which could occassionally produce
a runtime error of "dictionary changed size during iteration".

Backport of 559cb826b8 from master
 2013-09-06 17:32:08 -04:00
Keith Edmiston
2c73ba88f2 [1.6.x] Fixed #19295 -- Documented that CachedStaticFilesStorage isn't compatible with runserver --insecure. 
Backport of 028db97503 from master
 2013-09-06 17:30:59 -04:00
Tim Graham
da44a8bdc2 [1.6.x] Fixed #20646 -- Clarified the use of AbstractBaseUser.REQUIRED_FIELDS 
Thanks craigbruce.

Backport of db3de52807 from master
 2013-09-06 16:06:46 -04:00
Tim Graham
544382dd85 [1.6.x] Fixed instructions for running a subset of tests. 
Backport of cd4068f359 from master
 2013-09-06 14:31:43 -04:00
Eric Boersma
180b9955cc [1.6.x] Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.

Backport of 4d13cc56de from master
 2013-09-05 20:16:14 -04:00
micahhausler
9f69ae7847 [1.6.x] Fixed #21047 -- Added CLA mesage on the new contributor advice doc 
Backport of 93dd31cadf from master
 2013-09-05 17:54:56 -04:00
Tim Graham
1dd061ad77 [1.6.x] Fixed #21044 -- Documented django.core.urlresolvers.Resolver404 
Thanks Keryn Knight for the suggestion.

Backport of eacf060e01 from master
 2013-09-05 08:45:58 -04:00
Tim Graham
622d5c7650 [1.6.x] Fixed #20900 -- Documented RemoteUserBackend.authenticate 
Backport of 7b62b80693 from master
 2013-09-05 06:32:50 -04:00
Tim Graham
77cf0d6519 [1.6.x] Fixed #21041 -- Removed a duplicate form in tests. 
Thanks tuxcanfly.

Backport of bab039d74c from master
 2013-09-05 06:32:26 -04:00
Aymeric Augustin
a8624b22a7 [1.6.x] Tested exc_type instead of exc_value in __exit__. 
exc_value might be None even though there's an exception, at least on
Python 2.6. Thanks Thomas Chaumeny for the report.

Fixed #21034.
 2013-09-04 16:18:47 -05:00
Aymeric Augustin
7c1efc2fa6 Updated six to version 1.4.1. 2013-09-04 15:23:24 -05:00
Tim Graham
cda4fc8225 [1.6.x] Fixed #20958 -- Documented that GenericForeignKey fields can't be accessed in forms. 
Thanks marky1991.

Backport of 533d1ab334 from master
 2013-09-04 13:19:32 -04:00
Paul C. Anagnostopoulos
fe0eb2f995 [1.6.x] Clarified docs for some tags and filters 
Backport of 1ccdc08189 from master
 2013-09-04 13:04:51 -04:00
Carl Meyer
4420de89b6 [1.6.x] Fixed #21026 -- Corrected help for manage.py test command. 
Backport of 8f7f8bf688 from master.
 2013-09-03 09:51:17 -06:00
Loic Bistuer
a62b640f7d [1.6.x] Fixed #20973 -- Document serving static files without django.contrib.staticfiles 
Backport of 7b04038a7f from master
 2013-09-03 09:01:43 -04:00
Aymeric Augustin
2a14c08e71 Used six.moves.zip_longest, new in six 1.4.0. 2013-09-03 07:34:45 -05:00
Aymeric Augustin
115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
 2013-09-03 07:34:45 -05:00
Aymeric Augustin
50012577f3 [1.6.x] Updated the bundled version of six to 1.4.0. 
Backport of 42920970 from master.
 2013-09-03 07:34:44 -05:00
Claude Paroz
0514fbb2f3 [1.6.x] Fixed #21003 -- Ensured geometry widget return value has SRID 
Thanks Mathieu Leplatre for the report and initial patch.
Backport of dd656073ad from master.
 2013-09-03 13:55:20 +02:00
Claude Paroz
bd0319a261 [1.6.x] Isolated map creation JS code 
Backport of 3550b27a8 from master.
 2013-09-03 13:54:50 +02:00
Tim Graham
c0fb6bdde3 [1.6.x] Fixed #21002 -- Documented JSON session serialization requires string keys 
Thanks jeroen.pulles at redslider.net for the report.

Backport of 3baf1d1042 from master
 2013-09-03 07:49:59 -04:00
Claude Paroz
b53ce2f31c [1.6.x] Prevented rendering attrs to be squashed in OSMWidget 
Backport of b6889c68d7 from master.
 2013-09-03 10:04:50 +02:00
Claude Paroz
aa1c175687 [1.6.x] Fixed syntax error in OSMWidget 
Backport of 6ecbac21a from master.
 2013-09-03 09:08:25 +02:00
Claude Paroz
0c57868908 [1.6.x] Fixed gis test to run on non gis-enabled settings 
Refs #20998.
Backport of 973502c0 from master.
 2013-09-02 14:31:20 +02:00
Claude Paroz
4e3794dd1f [1.6.x] Fixed #20998 -- Allow custom (de)serialization for GIS widgets 
Thanks Mathieu Leplatre for the report and the initial patch.
Backport of 102f26c92 from master.
 2013-09-02 13:34:26 +02:00
Loic Bistuer
64383e8349 [1.6.x] Made the doc about translating string literals in templates more prominent. 
Backport of 9885f07757 from master
 2013-08-31 08:00:33 -04:00
Claude Paroz
68ae9f39b7 [1.6.x] Fixed copy/paste error in measurement docs 
Backport of e87997dd33 frmo master.
 2013-08-31 10:33:46 +02:00
Tim Graham
0089a9a854 [1.6.x] Fixed typo in docs/ref/models/options.txt 
Backport of a89c856a7a from master
 2013-08-30 21:07:04 -04:00
Carl Meyer
21a3efcf48 [1.6.x] Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions. 
Refs #18162. Thanks claudep and mjtamlyn for review.

Backport of 7211741fc5 from master.
 2013-08-30 17:45:14 -06:00
Claude Paroz
1d874ce0f9 [1.6.x] Set 'bidi' Urdu property to True 
Refs #20454.
Backport of e4a67fd90 from master.
 2013-08-30 12:04:17 +02:00
Anssi Kääriäinen
76e38a2177 [1.6.x] Fixed #20988 -- Added model meta option select_on_save 
The option can be used to force pre 1.6 style SELECT on save behaviour.
This is needed in case the database returns zero updated rows even if
there is a matching row in the DB. One such case is PostgreSQL update
trigger that returns NULL.

Reviewed by Tim Graham.

Refs #16649

Backport of e973ee6a98 from master

Conflicts:
	django/db/models/options.py
	tests/basic/tests.py
 2013-08-30 09:47:34 +03:00
Anssi Kääriäinen
cd10e998b6 [1.6.x] Removed stale add_q() comment 
Backport of 13be3bfef1 from master
 2013-08-30 09:46:16 +03:00
Jorge C. Leitão
60df34d477 [1.6.x] Added links to file docs. 
Backport of d72f83c410 from master
 2013-08-29 12:49:27 -04:00
Tim Graham
10d15f79e5 [1.6.x] Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value twice if prepared is False. 
Thanks homm for the report and Aramgutang and lrekucki for work on
the patch.

Backport of f19a3669b8 from master
 2013-08-29 12:14:40 -04:00
Tim Graham
ef1259342b [1.6.x] Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash. 
Thanks chris at cogdon.org for the report and admackin for the patch.

Backport of af953c45cc from master
 2013-08-29 09:45:02 -04:00
Claude Paroz
58157be5ad [1.6.x] Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3 
Thanks lvella at gmail.com for the report.
Backport of 169637649 from master.
 2013-08-29 08:43:35 +02:00
Phaneendra Chiruvella
68eca2b36f [1.6.x] Minor spelling correction in ModelForms docs 
Backport of 2fbf949760 from master
 2013-08-28 07:12:38 -04:00
Krzysztof Jurewicz
544a190ebf [1.6.x] Fixed #20981 -- Noted the default value of disable_existing_loggers. 
Backport of 095643e691 from master
 2013-08-27 10:27:44 -04:00
Jan Böcker
c4e2e4f630 [1.6.x] Fixed typo in docs/topics/conditional-view-processing.txt 
Backport of 5fd2c979cb from master
 2013-08-27 09:22:31 -04:00
Matt Robenolt
28026c3e26 [1.6.x] Updated instructions for running contrib tests. 
Backport of 08e7a64369 from master
 2013-08-27 08:24:31 -04:00
Claude Paroz
2c08d474a8 [1.6.x] Fixed #20961 -- Fixed HttpResponse default empty content 
Thanks epandurski at gmail.com for the report.
Backport of f4e980456 from master.
 2013-08-24 18:10:50 +02:00
Ramiro Morales
2a166623a6 [1.6.x] Typos introduced in 57c82f909b. 2013-08-22 22:33:59 -03:00