mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity
16,963 Commits 28 Branches 426 Tags 666 MiB
78a2617703
Commit Graph

16963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anssi Kääriäinen
78a2617703 Fixed #21787 -- regression in MTI .exclude() queries 2014-01-24 10:10:17 +02:00
Marc Tamlyn
16f3a6a4c7 Fixed #21865 -- Incorrect signs in documented example. 
Maths is hard.
 2014-01-23 20:32:24 +00:00
Marc Tamlyn
89df51803e Merge branch 'stable/1.7.X' 
We fork at beta. This branch will be recreated when the first beta is created.
It has been merged in to maintain the version number bump and tag.
 2014-01-23 20:21:11 +00:00
Tim Graham
0b6b1ee242 Merge pull request #2203 from mjtamlyn/post-beta-branching 
We should branch after the first beta.
 2014-01-23 12:08:59 -08:00
Marc Tamlyn
d7aa0bd802 We should branch after the first beta. 
We did this for 1.6 and it was very effective. 95%+ of fixes which merge
during the alpha are backported, as the policy is "all but really major
features". It's easier to just not merge any really major features.
After beta, we have feature freeze so we need to backport bugs to stable
but not features, so then the branch makes sense.
 2014-01-23 20:07:14 +00:00
Tom Atkins
3b869b09d0 Fixed #21847 -- Clarified where ContactForm was defined 2014-01-23 13:48:09 -05:00
Alex Gaynor
d01edbcdda Merge pull request #2205 from ctbarna/21864-custom-lookup-unclosed-string 
Fixes #21864: Close string in example of custom lookups doc page.
 2014-01-23 07:14:28 -08:00
Baptiste Mispelon
d7ce48f175 Fixed #21864 -- Fixed missing quote in custom lookup example. 
Thanks to Chris Barna for the report.
 2014-01-23 16:13:20 +01:00
Chris Barna
7d9014864c Fixes #21864: Close string in example of custom lookups doc page. 2014-01-23 10:11:15 -05:00
Tim Graham
12303ab738 Fixed #21861 -- Fixed typo in 1.7 release notes. 
Thanks marktranchant.
 2014-01-23 09:29:09 -05:00
Tim Graham
81830ce34f Fixed some punctuation; thanks Chris Jerdonek. 2014-01-23 09:01:26 -05:00
Andrew Godwin
b8c8241945 Add docs about converting from South 2014-01-23 11:45:25 +00:00
Marc Tamlyn
8295169f06 We should branch after the first beta. 
We did this for 1.6 and it was very effective. 95%+ of fixes which merge
during the alpha are backported, as the policy is "all but really major
features". It's easier to just not merge any really major features.
After beta, we have feature freeze so we need to backport bugs to stable
but not features, so then the branch makes sense.
 2014-01-23 08:21:14 +00:00
James Bennett
8be9a250c1 [1.7.x] Bump version number for 1.7 alpha 1. 2014-01-22 21:48:37 -06:00
Baptiste Mispelon
05d36dc06e Always use parentheses when documenting a method with no arguments. 2014-01-22 22:26:10 +01:00
Baptiste Mispelon
79e1d6ebd7 Don't show self in the list of arguments of a method. 
This is consistent with Python's official documentation
and it's a sphinx recommendation too[1].

[1] http://sphinx-doc.org/markup/desc.html#dir-method

Refs #21855.
 2014-01-22 22:17:32 +01:00
Tim Graham
5f9790072d Fixed #20834 -- Described how caching of user permissions works. 
Thanks Giggaflop and Jennifer Casavantes.
 2014-01-22 13:08:51 -05:00
Tim Graham
4416aa1d3f Added a link to the 1.6 release notes which also fixed a rendering issue. 2014-01-22 11:04:44 -05:00
Tim Graham
dfc092622e Fixed #21529 -- Noted that {% url %} encodes its output (refs #13260). 2014-01-22 10:44:50 -05:00
Alex Gaynor
2ba09c000d Added some missing whitespace around arithmetic operators 2014-01-22 09:21:05 -06:00
Tim Graham
6f06c749b7 Fixed #21726 -- Clarified that password should not be included in REQUIRED_FIELDS. 
Thanks russellm for the report.
 2014-01-22 10:17:44 -05:00
Tim Graham
03395b4277 Fixed some markup that caused broken links in the static files docs. 2014-01-22 10:15:27 -05:00
Loic Bistuer
c3fdeb28ff Fixed #21846 -- Made NestedObjects handle related_name with %(app_label)s or %(class)s. 2014-01-22 09:13:15 -05:00
Andrew Godwin
a5ec11c4bb Merge pull request #2198 from Markush2010/ticket21852 
Fixed #21852 -- Make migration writer serialize iterators
 2014-01-22 03:45:30 -08:00
Oliver George
a4fbdcdf66 Fixed #21850 -- Made GeometryField.geodetic case insensitive 2014-01-22 09:26:38 +01:00
Markus Holtermann
047394f79c Fixed #21852 -- Make migration writer serialize iterators 2014-01-22 09:21:54 +01:00
Florian Apolloner
088cb711fe Fixed #21827 -- Install django-admin and django-admin.py 
We need to figure out how to deprecate django-admin.py, but for now this
should do the trick.
 2014-01-21 17:40:52 +01:00
Tim Graham
8606785faa Merge pull request #2186 from zemanel/master 
Fixed typo on docstring
 2014-01-21 04:46:14 -08:00
Russell Keith-Magee
494b408041 Corrected problem with MySQL checks handler and related fields. 2014-01-21 18:37:49 +08:00
Florian Apolloner
151dae2bea Changed django-admin back to django-admin.py. Refs #21827 2014-01-21 09:21:51 +01:00
Alex Gaynor
8482ab6633 Removed some stray newlines which caused flake8 issues 2014-01-20 22:58:05 -06:00
Carl Meyer
fb862c875e Fix a check_framework test so it doesn't fail when TEST_RUNNER is set (e.g. on CI). 2014-01-20 21:08:02 -07:00
Carl Meyer
6070a5d6a6 Fixes #21833 -- Fix UserSettingsHolder.is_overridden() and add tests. 2014-01-20 20:25:33 -07:00
Russell Keith-Magee
56516ade5e Refs #21831 -- Softened the TestClient dependency on contrib.auth. 
This is to prevent an import of django.test causing an import (and thus
an implicit checks regisration) for an app that may not be in
`INSTALLED_APPS`.

Better fixes may be possible when #20915 and/or #21829 are addressed.

Thanks to @carljm for the report.
 2014-01-21 08:51:23 +08:00
Jannis Leidel
8efd20f96d Added ManifestStaticFilesStorage to staticfiles contrib app. 
It uses a static manifest file that is created when running
collectstatic in the JSON format.
 2014-01-20 19:32:07 +01:00
José Moreira
8649833cf8 fixed typo on docstring 2014-01-20 16:33:11 +00:00
Alex Gaynor
ee25ea0daf Removed a stray new line which upset flake8 2014-01-20 09:57:35 -06:00
Russell Keith-Magee
e8920e96d0 Added a missing command to the command line examples for check. 
Thanks to Bruno Renie for the report.
 2014-01-20 20:46:21 +08:00
Russell Keith-Magee
53aa6c6ac1 Added warning silencers to some noisy tests. 
These warnings all emerged as the result of the introduction of the checks framework.

Thanks to Anssi Kääriäinen for the report.
 2014-01-20 20:30:29 +08:00
Russell Keith-Magee
b0602e935c Corrected documentation typo. 
Thanks to @cjerdonek for the report.
 2014-01-20 19:48:06 +08:00
Anssi Kääriäinen
6ab58e3605 Fixed a couple of deprecation warnings 2014-01-20 13:12:15 +02:00
Shai Berger
056be4358d Fixed two test failures under Oracle 2014-01-20 13:01:14 +02:00
Anssi Kääriäinen
980eda0190 Fixed custom_lookups tests for Oracle 
Refs #21821
 2014-01-20 10:52:58 +02:00
Anssi Kääriäinen
1c360dbbf5 Use date_extract_sql() for DateFields 
Refs #21821
 2014-01-20 10:52:58 +02:00
Anssi Kääriäinen
b86321e9a4 Fixed regex lookup on Oracle 
Refs #21821
 2014-01-20 10:52:58 +02:00
Anssi Kääriäinen
a9f1711518 Fixed Oracle in lookup when more than 1000 params 
Refs #21821.
 2014-01-20 10:52:57 +02:00
Claude Paroz
457c16d0d6 Fixed multi geometries editing in OpenLayers widget 2014-01-20 09:19:23 +01:00
Russell Keith-Magee
9ddc358e8d Corrected minor typo. 
Thanks to @cjerdonek for the report.
 2014-01-20 13:13:16 +08:00
Russell Keith-Magee
a029efca44 Removed an inactive system check for upload_to. 
Thanks to Simon Charette for the eagle eyes.
 2014-01-20 12:31:35 +08:00
Alex Gaynor
be8173af51 Fixed a small collection of flake8 violations that had snuck in 2014-01-19 21:15:31 -06:00