mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 17:16:10 +00:00
Code Issues 32 Releases Wiki Activity
17,426 Commits 30 Branches 460 Tags
07c42cee7f400ca35106aa5562cdfa99cb1b8b62
Commit Graph

17426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Graham
07c42cee7f [1.7.x] Replaced urllib/urlparse imports with from django.utils.six.moves. 
Backport of 981b864fbd from master
 2014-03-31 07:55:25 -04:00
Loic Bistuer
5268d71f18 [1.7.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:20:20 -04:00
Tim Graham
25da849896 [1.7.x] Added 1.6.3 release note for refs #22250. 
Backport of d57ba04d89 from master
 2014-03-31 07:12:12 -04:00
Tim Graham
2f2d21fe5c [1.7.x] Fixed typo in docstring. 
Backport of 029d77eaaa from master
 2014-03-31 07:01:27 -04:00
Loic Bistuer
8e73d3a2c1 [1.7.x] Fixed #22319 -- Fixed migration external dependencies when there are internal dependencies. 
Backport of 0fd51cf0bd from master
 2014-03-31 06:57:44 -04:00
Loic Bistuer
bdec848063 [1.7.x] Fixed #22359 -- Changing M2M field to blank=True failed on sqlite. 
Backport of a449e7feec from master
 2014-03-31 06:35:06 -04:00
Ramiro Morales
422f5d9a2c [1.7.x] Corrected an import in a model form docs example. 
cb5dd99bb4 from master.
 2014-03-30 20:34:29 -03:00
Berker Peksag
273f8e2297 [1.7.x] Added Python 3.4 to classifiers in setup.py. 
Backport of 47509e3c5d from master
 2014-03-30 17:46:38 -04:00
Tim Graham
0f9f8738d5 [1.7.x] Fixed #22338 -- Fixed a test dependent on dictionary key iteration order. 
Backport of 69a4f383f6 from master
 2014-03-30 14:27:05 -04:00
Aymeric Augustin
18b2c03ea3 [1.7.x] Increased memoization cache size for language codes. 
There may be more than 100 (default maxsize) commonly seen xx-yy values
on some sites. The additional memory consumption isn't significant.

Also added a comment explaining why this cache must have a maxsize.

Backport of f356b6e from master.
 2014-03-29 19:47:47 +01:00
Tim Graham
c139e3e0a0 [1.7.x] Fixed #21858 -- Clarified 1.6 release note regarding M2M help text changes. 
Thanks lee at semel.net for the report.

Backport of f30e6590f4 from master
 2014-03-29 10:23:23 -04:00
Anssi Kääriäinen
a6a0800579 [1.7.x] Fixed #22250 -- regression in gis compiler for non-concrete fields 
Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e66e from master
 2014-03-29 08:28:43 +02:00
Tim Graham
c9014a95bc [1.7.x] Skipped JavascriptI18nTests if Firefox isn't properly configured. 
Code borrowed from django.contrib.admin.tests. Without this, the class can
throw an exception with something like "The browser appears to have exited
before we could connect. The output was: Error: no display specified"

Backport of e2ac0203d9 from master
 2014-03-28 07:30:35 -04:00
Tim Graham
5f04240381 [1.7.x] Added Python 3.4 support notes. 
Backport of 306deab2c7 from master
 2014-03-27 08:12:58 -04:00
Tim Martin
e2e773c04a [1.7.x] Fixed #21941 -- Documented the kwargs param of django.conf.urls.url(). 
Thanks cjerdonek for the report.

Backport of a779757706 from master
 2014-03-27 07:02:02 -04:00
Tim Graham
0134d00be5 [1.7.x] Skipped a test that errors rather than marked it as an expectedFailure. 
The test throws an error which Python 3.4 doesn't seem to catch as an
expectedFailure.

refs 7476d96f83

Backport of c170c3761b from master
 2014-03-27 07:01:20 -04:00
Tim Graham
3d74f1f64a [1.7.x] Fixed a deprecation warning on Python 3. 
Backport of c19bbefca2 from master
 2014-03-27 07:01:04 -04:00
Chris Beaven
fe61ba91c7 [1.7.x] Add a useful stacklevel to some RemovedInDjango19Warnings 
Backport of b077ba7ac1 from master
 2014-03-27 06:11:01 -04:00
Simon Charette
4678efd3f1 [1.7.x] Fixed the PostGIS circular imports caused by 1506c71a95. 
Thanks to @loic for the help and @timgraham for the review.

refs #12030.

Backport of b9e50e4774 from master
 2014-03-26 13:02:52 -04:00
Tim Graham
994274ea83 [1.7.x] Fixed #22029 -- Removed obsolete advice on registering migrate/syncdb signal handlers. 
All signals should now be registered in AppConfig.ready().

Thanks un33k for the report.

Backport of 5233b36693 from master
 2014-03-26 10:41:45 -04:00
Tim Graham
4bd7411edf [1.7.x] Fixed Python 3.4 test failure. 
Backport of 45ef4baf5c from master
 2014-03-26 10:11:12 -04:00
Loic Bistuer
39fc8d4b8e [1.7.x] Fixed #22331 -- Made MigrationAutodetector ignore unmanaged models. 
This commit reverts 69d4b1c and tackle the issue from a different angle.
Models remain present in the project state, but are now ignored by the
autodetector.

Backport of 42336c84a0 from master
 2014-03-25 20:04:49 -04:00
Andrew Godwin
1cb6729f58 [1.7.x] Add some syncdb deprecation stuff into the deprecation doc 
Backport of 378359de1c from master
 2014-03-25 20:02:07 -04:00
Simon Charette
81d3d48b5e [1.7.x] Fixed field deconstruction tests failures introduced by 1506c71a95. 
refs #12030.

Backport of ff874f363c from master
 2014-03-25 19:30:33 -04:00
Simon Charette
78211b13a5 [1.7.x] Fixed #12030 -- Validate integer field range at the model level. 
Thanks to @timgraham for the review.

Backport of 1506c71a95 from master
 2014-03-25 14:31:54 -04:00
Tim Graham
7eaf329ad3 [1.7.x] Fixed #22322 -- Fixed incorrect explanation of what managed=False does. 
refs #14305.

Thanks Adrian Klaver for the report.

Backport of 9b7ba8af1b from master
 2014-03-25 14:03:02 -04:00
Tim Graham
d84beb3d91 Revert "[1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models." 
This reverts commit bf69375c4d.
 2014-03-25 12:07:37 -04:00
Loic Bistuer
bf69375c4d [1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models. 
Backport of 69d4b1c3ea from master
 2014-03-25 10:34:28 -04:00
David Evans
ddcbde41ee [1.7.x] Fixed #22315 -- str/bytes mismatch in staticfiles 
Previously, `ManifestFilesMixin.read_manifest` failed in Python 3
because `json.loads` accepts `str` not `bytes`.

Backport of 86dcac4634 from master
 2014-03-25 09:55:29 -04:00
Ben Davis
2460484486 [1.7.x] Fixed #22087 -- Made AdminReadonlyField respect ModelForm Meta overrides. 
Backport of 16afffffe8 from master
 2014-03-25 09:34:12 -04:00
Stephen Burrows
b4f165fe94 [1.7.x] Fixed #22300 -- Fixed crash in migrations when changing non-relational field to relational. 
Backport of 35ed792cf2 from master
 2014-03-25 07:46:48 -04:00
Daniel Hahler
21eaad68e6 [1.7.x] Fixed #22293 -- Avoided renaming many-to-many tables to themselves. 
Fixed this for both implementations of _alter_many_to_many, instead of
in `alter_db_table` itself (more implementations).

Backport of 1edfa155e3 from master
 2014-03-24 13:27:06 -04:00
Jannis
345281b880 [1.7.x] Fixed typo in error message in django.contrib.sitemaps. 
Backport of d81a9c50d8 from master
 2014-03-24 13:06:58 -04:00
Adam Kaliński
eb1600e9d1 [1.7.x] Fixed #22048 - Enhanced docs to cover nonexistent one-to-one relationships. 
Thanks EvilDMP for the suggestion.

Backport of ec08d62a20 from master
 2014-03-24 09:45:50 -04:00
Tim Graham
57a373b08c [1.7.x] Fixed #22247 -- Replaced "upstream" with "downstream" in cache docs. 
Thanks valgarv at gmx.net for the report.

Backport of 60d2dde286 from master
 2014-03-24 09:19:46 -04:00
Tim Graham
68a80166cd [1.7.x] Fixed #21665 -- Documented that changes in assertRedirects may be required given new URL escaping behavior. 
Thank pdc for the report.

Backport of 62e81bc00b from master
 2014-03-24 09:09:19 -04:00
Tim Graham
70b34f095c [1.7.x] Updated six to 1.6.1. 
Backport of 2ec82c7387 from master
 2014-03-24 07:34:18 -04:00
Moayad Mardini
f847aeb6f8 [1.7.x] Fixed #22265 -- Clarfied consistent behavior of migrations. 
Thanks aruseni for the report.

Backport of bff77e2aa8 from master
 2014-03-24 07:27:27 -04:00
James Bennett
1694e091f1 [1.7.x] Correct oversight in trove classifiers, as this branch is now beta status. 2014-03-23 23:09:12 -05:00
Claude Paroz
e1a6a3024f [1.7.x] Fixed #22317 -- Fixed documented handler400 default value 
Backport of 3f7615cddc from master.
 2014-03-23 21:20:19 +01:00
Alex Gaynor
6d254e5a97 [1.7.x] Removed an unused variable. 
Backport of 684e8a941b from master
 2014-03-22 13:17:51 -04:00
Claude Paroz
d345a030c2 [1.7.x] Fixed #22241 -- Selectively added line breaks in admin read-only fields 
When content is supposed to contain HTML, we do not try to add
line breaks in read-only contents.
Thanks Alexander Todorov for the report.
Backport of c94bff2 from master.
 2014-03-22 17:11:12 +01:00
Patrick Michaud
908bdea482 [1.7.x] Fixed #22256 -- Replaced bad fallback for missing PATH 
Thanks Baptiste Mispelon for the review.
Backport of acee46fc9 from master.
 2014-03-22 16:54:02 +01:00
Claude Paroz
07d4b3c8f2 [1.7.x] Tweaked strip_tags tests to pass on Python 3.3 
Backport of 6a0291bdaf from master.
 2014-03-22 14:44:13 +01:00
Claude Paroz
4b72532048 [1.7.x] Added release note about strip_tags improvement 
Backport of 1c8dbb0cc from master.
 2014-03-22 12:35:56 +01:00
Claude Paroz
80f08dbdbc [1.7.x] Improved strip_tags and clarified documentation 
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/
Backport of 6ca6c36f82 from master.
 2014-03-22 11:01:14 +01:00
Antti Hirvonen
0c19383a1f [1.7.x] Fixed #22302 -- Updated Finnish locale formats 
Backport of aaa2110259 from master.
 2014-03-22 10:55:10 +01:00
Aymeric Augustin
60d2213d43 [1.7.x] Small doc changes missed in 66076268. 
Partial backport of 253e8ac2 from master.
 2014-03-21 22:09:57 +01:00
Thomas Schreiber
79989263a2 [1.7.x] Fixed typos in docs (django.contrib.site) 
Backport of 907ac64641 from master.
 2014-03-21 20:02:03 +01:00
Tim Graham
563d6a6bba [1.7.x] Replaced an instance of PIL with Pillow in the docs. 
Done in 4965a77407 on master.
 2014-03-21 11:23:59 -04:00