1
0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00

265 Commits

Author SHA1 Message Date
Jordi Yeh
ec2d456df8 [1.5.x] Fixed #22457 -- Fixed contributing guide w/o github set-up
The published commnand was not working when the user did not have
the git client set-up with the public-key. Changed the contributing
guide to clone it from https instead.

Backport of 28102991172ab931d030412275f926c1b05c688d from master
2014-04-16 09:40:32 -04:00
James Turley
c539a4490f [1.5.x] Fixed #21824 -- Added reference to LTS in docs/internals/security.txt
Backport of 4d8209431d from master
2014-01-24 08:14:46 -05:00
Jacob Kaplan-Moss
267aeabfc7 [1.5.x] Added a note about LTS releases.
Backport of a44cbca2a5f1388c6511dad48443877fa660845a from master.
2014-01-19 18:46:18 +01:00
Alasdair Nicol
86c5115cad [1.5.x] Fixed #21538 -- Added numpy to test/requirements/base.txt
Thanks Tim Graham for the report

Backport of c75dd664c from master
2013-12-02 13:41:18 -05:00
Aymeric Augustin
01fed9c258 Removed obsolete deprecation notes. 2013-11-23 14:47:41 +01:00
Baptiste Mispelon
43ab759ce3 [1.5.X] Fixed wording in unit tests documentation.
Backport of 42b9feb2e79546e1d4362c3a4f0043f3c569ace3 from master.
2013-09-25 18:32:07 +02:00
Russell Keith-Magee
75c0aa43d3 [1.5.x] Fixed #21121: Added archive of security issues.
Backport of 9d3e60a, 8e134c2, 8b3bae9, c65ae7c, bbabc53,
and a2e25e8 from master.
2013-09-19 15:07:29 +08:00
Kevin Christopher Henry
61867e226d [1.5.x] Documentation -- added instructions on working with pull requests
Since non-core contributors are asked to review patches, instructions
on working with pull requests were added to the Working with Git and
GitHub page (based on the existing instructions in the core
committers page).

Backport of 990ce9aab9 from master
2013-09-13 08:27:28 -04:00
micahhausler
e62f391022 [1.5.x] Fixed #21047 -- Added CLA mesage on the new contributor advice doc
Backport of 93dd31cadf from master
2013-09-05 17:55:09 -04:00
Tim Graham
12edced1de [1.5.x] Fixed #20868 -- Added an email to django-announce as a security step.
Thanks garrison for the report.

Backport of 5737c57d95 from master
2013-08-09 16:02:57 -04:00
Tim Graham
14b5073978 [1.5.x] Added a missing test requirement in the docs; refs #19196 2013-07-10 12:10:26 -04:00
Tim Graham
13546cae9c [1.5.x] Fixed #19196 -- Added test/requirements
Backport of 4d92a0bd86 from master.
2013-07-10 11:32:28 -04:00
Tim Graham
63cab03f6d [1.5.x] Tweaked unit test 'quick start' explanation.
Thanks Jeremy Dunck.

Backport of 490672f057 from master
2013-05-20 13:49:11 -04:00
Claude Paroz
8b345614cd [1.5.x] Updated Transifex links to the Django project
Translations for the Django framework are now hosted on the
django-core Transifex project, and the django project is only
dedicated to a team-only hub project.
Backport of 8f7276b782 from master.
2013-04-25 10:38:18 +02:00
Richard Cornish
29c77c5ed2 [1.5.X] Updated bios of committers
Backport of 6e67d764ae from master
2013-03-30 07:49:21 -04:00
Tim Graham
f7ca464039 [1.5.x] Added missing markup to docs.
Backport of 93cffc3b37 from master.
2013-03-22 14:08:55 -04:00
Julien Phalip
be5369fd24 [1.5.x] Fixed #19333 -- Moved compress.py outside of the admin static folder. Thanks to camilonova, Russell Keith-Magee, Aymeric Augustin and Ramiro Morales for the feedback.
Backport of c9c40bc6bc64e6
2013-02-02 15:03:05 -08:00
Aymeric Augustin
11ec0253ab [1.5.x] Fixed #19692 -- Completed deprecation of mimetype in favor of content_type.
Thanks Tim for the report and initial patch.

Backport of 89cb771 from master.
2013-01-31 13:55:00 +01:00
Tim Graham
5da6ce11ed [1.5.x] Fixed typos in docs and comments
Backport of ee26797cff from master
2013-01-29 10:58:24 -07:00
Tim Graham
d571894fc0 [1.5.x] Fixed #19639 - Updated contributing to reflect model choices best practices.
Thanks charettes.

Backport of eaa716a413 from master
2013-01-24 08:00:43 -05:00
Tim Graham
be1e006c58 [1.5.x] Fixed #19516 - Fixed remaining broken links.
Added -n to sphinx builds to catch issues going forward.

Backport of 9b5f64cc6e from master.
2013-01-02 18:50:00 -05:00
Tim Graham
9e5ada79bf [1.5.x] Fixed broken links, round 4. refs #19516
Backport of 067505ad19 from master
2012-12-29 15:57:57 -05:00
Preston Holmes
8d1b190248 [1.5.x] Fixed #19498 -- refactored auth documentation
The auth doc was a single page which had grown unwieldy.
This refactor split and grouped the content into sub-topics.
Additional corrections and cleanups were made along the way.
2012-12-28 11:48:05 -08:00
Aymeric Augustin
0c79e5e347 [1.5.x] Fixed #19518 -- Documented the deprecation of localflavor.
Also moved the contrib deprecations at the top of their section and made
minor markup fixes.

Backport of 4500d35 from master.
2012-12-26 14:30:11 +01:00
Julien Phalip
3ad34c231b [1.5.x] Fixed #19505 -- A more flexible implementation for customizable admin redirect urls.
Work by Julien Phalip.

Refs #8001, #18310, #19505. See also 0b908b92a2ca4fb74a103e96bb75c53c05d0a428.

35d1cd0b28d1d9cd7bffbfbc6cc2e02b58404415 from master.
2012-12-24 18:12:13 -03:00
Ramiro Morales
903892be7b [1.5.x] Fixed #19497 -- Refactored testing docs.
Thanks Tim Graham for the review and suggestions.

d19109fd37e75ccf29d2ca64370102753dbc7c5b from master.
2012-12-22 12:39:49 -03:00
Aymeric Augustin
c81e8e7068 [1.5.x] Fixed #19389 -- Docs on the location of contrib apps tests.
Backport of d5ed81c.
2012-12-08 19:48:41 +01:00
Aymeric Augustin
a586f2a7e5 [1.5.x] Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX.
Backport of 9b755a2 from master.
2012-11-17 23:05:16 +01:00
Tim Graham
04adb7626b [1.5.X] Fixed #16779 - Added a contributing tutorial
Thank-you Taavi Taijala for the draft patch!

Backport of 7058b595b6 from master
2012-11-17 14:12:18 -05:00
Preston Holmes
3bb8c6e1cd [1.5.x] Added a note and link to CLA from contributing docs 2012-11-04 12:26:23 -08:00
Preston Holmes
0131da0622 [1.5.x] Deprecated depth kwarg on select_related.
This is the start of a deprecation path for the depth kwarg on
select_related. Removing this will allow us to update select_related so
it chains properly and have an API similar to prefetch_related.

Thanks to Marc Tamlyn for spearheading and initial patch.

refs #16855
2012-11-02 22:03:55 -07:00
Aymeric Augustin
b760503a27 [1.5.x] Fixed #18978 -- Moved cleanup command to sessions.
This removes a dependency of 'core' on 'contrib'.

Backport of 83ba0a9 from master.

This deprecation occurs after the alpha, but it's a prerequisite
for fixing decently #18194 which is a release blocker.
2012-10-27 18:38:32 +02:00
Tim Graham
84849723ad [1.5.X] Fixed #19180 - Clarified policy regarding older versions of the docs.
Backport of 5c143cb340 from master
2012-10-25 17:56:30 -04:00
Preston Holmes
e8b258895a Tweaked tense of URL tag changes for clarity 2012-10-25 12:03:01 -07:00
Aymeric Augustin
495a8b8107 Fixed #6527 -- Provided repeatable content access
in HttpResponses instantiated with iterators.
2012-10-24 17:08:37 +02:00
Adrian Holovaty
72efdc4d92 Merge pull request #436 from ddbeck/patch-1
Removed heteronormativity from coding style doc
2012-10-15 07:45:27 -07:00
Claude Paroz
a451d2b4a2 Replaced mentions of Subversion by Git in docs 2012-10-14 23:03:01 +02:00
Tim Graham
06f5da3d78 Fixed #16817 - Added a guide of code coverage to contributing docs.
Thanks Pedro Lima for the draft patch.
2012-10-11 06:11:52 -04:00
Daniel D. Beck
f315006d50 Remove heteronormativity from coding style doc 2012-10-10 20:38:48 -03:00
Preston Holmes
14681eaa53 Fixed #19045 -- removed 'fixed on a branch' from triage docs 2012-10-01 09:00:41 -07:00
Preston Holmes
1df58968a4 Added a note regarding interaction between GitHub and Trac Plugin 2012-09-27 13:19:04 -07:00
Adrien Lemaire
2c8267bf3d Fixed #17899 -- Rewrote [Ee]-mail to [Ee]mail 2012-09-26 14:14:51 +02:00
Russell Keith-Magee
70a0de37d1 Fixed #3011 -- Added swappable auth.User models.
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.

Squashed commit of the following:

commit d84749a0f034a0a6906d20df047086b1219040d0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Wed Sep 26 18:37:04 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 531e7715da545f930c49919a19e954d41c59b446
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Wed Sep 26 07:09:23 2012 +0800

    Merged recent trunk changes.

commit 29d1abbe351fd5da855fe5ce09e24227d90ddc91
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 24 07:49:46 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 8a527dda13c9bec955b1f7e8db5822d1d9b32a01
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 24 07:48:05 2012 +0800

    Ensure sequences are reset correctly in the presence of swapped models.

commit e2b6e22f298eb986d74d28b8d9906f37f5ff8eb8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 23 17:53:05 2012 +0800

    Modifications to the handling and docs for auth forms.

commit 98aba856b534620aea9091f824b442b47d2fdb3c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 23 15:28:57 2012 +0800

    Improved error handling and docs for get_user_model()

commit 0229209c844f06dfeb33b0b8eeec000c127695b6
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 23 14:50:11 2012 +0800

    Merged recent Django trunk changes.

commit 6494bf91f2ddaaabec3ec017f2e3131937c35517
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 17 21:38:44 2012 +0800

    Improved validation of swappable model settings.

commit 5a04cde342cc860384eb844cfda5af55204564ad
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 17 07:15:14 2012 +0800

    Removed some unused imports.

commit ffd535e4136dc54f084b6ac467e81444696e1c8a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 20:31:28 2012 +0800

    Corrected attribute access on for get_by_natural_key

commit 913e1ac84c3d9c7c58a9b3bdbbb15ebccd8a8c0a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 20:12:34 2012 +0800

    Added test for proxy model safeguards on swappable models.

commit 280bf19e94d0d534d0e51bae485c1842558f4ff4
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 18:16:49 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit dbb3900775a99df8b6cb1d7063cf364eab55621a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 18:09:27 2012 +0800

    Fixes for Python 3 compatibility.

commit dfd72131d8664615e245aa0f95b82604ba6b3821
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 15:54:30 2012 +0800

    Added protection against proxying swapped models.

commit abcb027190e53613e7f1734e77ee185b2587de31
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 15:11:10 2012 +0800

    Cleanup and documentation of AbstractUser base class.

commit a9491a87763e307f0eb0dc246f54ac865a6ffb34
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 14:46:49 2012 +0800

    Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011

commit fd8bb4e3e498a92d7a8b340f0684d5f088aa4c92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 14:20:14 2012 +0800

    Documentation improvements coming from community review.

commit b550a6d06d016ab6a0198c4cb2dffe9cceabe8a5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 13:52:47 2012 +0800

    Refactored skipIfCustomUser into the contrib.auth tests.

commit 52a02f11107c3f0d711742b8ca65b75175b79d6a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 13:46:10 2012 +0800

    Refactored common 'get' pattern into manager method.

commit b441a6bbc7d6065175715cb09316b9f13268171b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 13:41:33 2012 +0800

    Added note about backwards incompatible change to admin login messages.

commit 08bcb4aec1ed154cefc631b8510ee13e9af0c19d
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date:   Sat Sep 15 18:30:33 2012 +0300

    Splitted User to AbstractUser and User

commit d9f5e5addbad5e1a01f67e7358e4f5091c3cad81
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date:   Sat Sep 15 18:30:02 2012 +0300

    Reworked REQUIRED_FIELDS + create_user() interaction

commit 579f152e4a6e06671e1ac1e59e2b43cf4d764bf4
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 20:18:37 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 918497218c58227f5032873ff97261627b2ceab2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 20:18:19 2012 +0800

    Deprecate AUTH_PROFILE_MODULE and get_profile().

commit 334cdfc1bb6a6794791497cdefda843bca2ea57a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 20:00:12 2012 +0800

    Added release notes for new swappable User feature.

commit 5d7bb22e8d913b51aba1c3360e7af8b01b6c0ab6
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 19:59:49 2012 +0800

    Ensure swapped models can't be queried.

commit 57ac6e3d32605a67581e875b37ec5b2284711a32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 14:31:54 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit f2ec915b20f81c8afeaa3df25f80689712f720f8
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 08:29:51 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 19526563b54fa300785c49cfb625c0c6158ced67
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 08:22:26 2012 +0800

    Merge recent changes from master.

commit 2c5e833a30bef4305d55eacc0703533152f5c427
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 07:53:46 2012 +0800

    Corrected admin_views tests following removal of the email fallback on admin logins.

commit 20d1892491839d6ef21f37db4ca136935c2076bf
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 01:00:37 2012 +0800

    Added conditional skips for all tests dependent on the default User model

commit 40ea8b888284775481fc1eaadeff267dbd7e3dfa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 8 23:47:02 2012 +0800

    Added documentation for REQUIRED_FIELDS in custom auth.

commit e6aaf659708cf6491f5485d3edfa616cb9214cc0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 8 23:20:02 2012 +0800

    Added first draft of custom User docs.

    Thanks to Greg Turner for the initial text.

commit 75118bd242eec87649da2859e8c50a199a8a1dca
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date:   Mon Aug 20 11:17:26 2012 +0800

    Admin app should not allow username discovery

    The admin app login form should not allow users to discover the username
    associated with an email address.

commit d088b3af58dad7449fc58493193a327725c57c22
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date:   Mon Aug 20 10:32:13 2012 +0800

    Admin app login form should use swapped user model

commit 7e82e83d67ee0871a72e1a3a723afdd214fcefc3
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Fri Sep 7 23:45:03 2012 +0800

    Merged master changes.

commit e29c010beb96ca07697c4e3e0c0d5d3ffdc4c0a3
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Aug 20 13:12:57 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 8e3fd703d02c31a4c3ac9f51f5011d03c0bd47f6
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Aug 20 13:09:09 2012 +0800

    Merged recent changes from trunk.

commit 507bb50a9291bfcdcfa1198f9fea21d4e3b1e762
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Jun 4 20:41:37 2012 +0800

    Modified auth app so that login with alternate auth app is possible.

commit dabe3628362ab7a4a6c9686dd874803baa997eaa
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Jun 4 20:10:51 2012 +0800

    Modified auth management commands to handle custom user definitions.

commit 7cc0baf89d490c92ef3f1dc909b8090191a1294b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Jun 4 14:17:28 2012 +0800

    Added model Meta option for swappable models, and made auth.User a swappable model
2012-09-26 18:48:09 +08:00
Alex Gaynor
e06b54391d Removed an excess colon. Thanks to jMyles for the patch. 2012-09-20 13:49:26 -07:00
Preston Holmes
b1b32b2074 Added myself as a committer. 2012-09-17 22:02:16 -07:00
Bryan Veloso
abfba3bb65 Correcting my English. 2012-09-14 19:26:11 -07:00
Bryan Veloso
a01bce1e26 Adding myself to the committers list. 2012-09-14 19:24:39 -07:00
Jeremy Dunck
9db7652eef Fixed my terribly outdated profile in committers.txt in celebration of my commit bit. 2012-09-12 14:37:44 -07:00
Preston Holmes
3da43c1111 Fixed #18054 -- Deprecated contrib.markup. Thanks to simukis for the initial patch. 2012-09-08 12:13:46 -04:00
Tim Graham
36df198e4b Fixed #18647 - Removed link to Malcolm's blog which is gone. 2012-08-30 07:44:41 -04:00