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

227 Commits

Author SHA1 Message Date
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
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 d84749a0f0
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 531e7715da
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 29d1abbe35
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 8a527dda13
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 e2b6e22f29
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 98aba856b5
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 0229209c84
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 6494bf91f2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 17 21:38:44 2012 +0800

    Improved validation of swappable model settings.

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

    Removed some unused imports.

commit ffd535e413
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 913e1ac84c
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 280bf19e94
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 dbb3900775
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 18:09:27 2012 +0800

    Fixes for Python 3 compatibility.

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

    Added protection against proxying swapped models.

commit abcb027190
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 a9491a8776
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 fd8bb4e3e4
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 14:20:14 2012 +0800

    Documentation improvements coming from community review.

commit b550a6d06d
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 52a02f1110
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 b441a6bbc7
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 08bcb4aec1
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date:   Sat Sep 15 18:30:33 2012 +0300

    Splitted User to AbstractUser and User

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

    Reworked REQUIRED_FIELDS + create_user() interaction

commit 579f152e4a
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 918497218c
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 334cdfc1bb
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 5d7bb22e8d
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 57ac6e3d32
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 f2ec915b20
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 19526563b5
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 2c5e833a30
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 20d1892491
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 40ea8b8882
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 e6aaf65970
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 75118bd242
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 d088b3af58
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 7e82e83d67
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Fri Sep 7 23:45:03 2012 +0800

    Merged master changes.

commit e29c010beb
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 8e3fd703d0
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 507bb50a92
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 dabe362836
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 7cc0baf89d
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
Florian Apolloner 9e7b5ba50f Removed missplaced label in the docs. 2012-08-12 12:43:05 +02:00
James Bennett 50c41e77e8 Put all the security-related notes in the same notice box. 2012-08-07 16:28:12 -04:00
James Bennett 483fb75049 Link security policies from internals index. 2012-08-07 16:25:21 -04:00
James Bennett 1ef1bceb3b Add new security-policy documentation. 
This formally describes our policies on reporting, notification and
disclosure of security issues, and provides a detailed explanation of
our full security-response process, for reference purposes.
 2012-08-07 16:06:34 -04:00
Simon Meers c59fff707a Reinstated Pinax link that was still in use by others. 2012-08-02 20:27:53 +10:00
Justin Bronn c0748a621c Updated my bio. 2012-07-29 16:53:56 -07:00
Alex Gaynor 6d0dbd88f6 Update my bio. 2012-07-18 08:04:29 -07:00
Jannis Leidel 810fd236fa Updated my bio. 2012-07-18 14:19:06 +02:00
Florian Apolloner adad6c3afe Added myself to internals/committers.txt. 2012-07-18 13:45:42 +02:00
Claude Paroz da200c5e35 Fixed #16519 -- Deprecated mimetype kwarg of HttpResponse __init__ 
This keyword was already deprecated in the code (supported for
backwards compatibility only), but never formally deprecated.
Thanks Paul McMillan for the report and yasar11732 for the initial
patch.
 2012-06-30 21:27:47 +02:00
Claude Paroz db87016b1a Fixed #12493 -- Deprecated auto-correction of TEMPLATE_DIRS 2012-06-30 15:06:42 +02:00
Claude Paroz 8a5d1a6b93 Updated obsolete links in the documentation 2012-06-28 10:49:07 +02:00
Julien Phalip 79ef3901da Fixed the path to the admin's compress.py script in the doc. 2012-06-16 16:23:03 -07:00
Jannis Leidel c4c7fbcc0d Fixed #18451 -- Vastly improved class based view documentation. 
Many thanks to Daniel Greenfeld, James Aylett, Marc Tamlyn, Simon Williams, Danilo Bargen and Luke Plant for their work on this.
 2012-06-11 10:40:23 +02:00
Anssi Kääriäinen 18aed863b4 Added myself to committers 2012-06-08 15:22:58 +03:00
Aymeric Augustin 7ae66517c1 Fixed an error in a git command. 2012-06-08 12:14:01 +02:00
Aymeric Augustin d2ad3b0f96 Clarified the purpose of the pull requsets docs 
One is for the community, the other for the core team.

Thanks Reinout van Rees for the report.
 2012-06-08 11:53:54 +02:00
Aymeric Augustin 1f203f84d0 Explained an alternative way to fetch a branch. 
This avoids adding each contributor as a remote.

Thanks Fruneau for the report.
 2012-06-08 11:40:33 +02:00
Aymeric Augustin 329bb9296f Proof-read the new contributing guide. 
Many thanks to Daniele Procida.
 2012-06-08 11:26:22 +02:00
Luke Plant f269f30544 Small corrections to committing-code docs 2012-06-08 00:02:52 +01:00
Aymeric Augustin 90fb6a4648 Fixed #18436 -- Updated contributing docs for git. 
Most of the credit for this large patch goes to Anssi Kääriäinen.
Many thanks to all the people who contributed to the discussion.
 2012-06-07 18:54:43 +02:00
Adrian Holovaty 87ff89d12d Fixed #17933 -- Added intro note to writing-documentation.txt 
Based on initial patch by Thomas Westfeld
 2012-06-07 11:32:28 -05:00
Aymeric Augustin c28e700c7e Removed references to changes made in 1.2. 
Thanks Florian Apolloner for the patch.
 2012-06-07 15:02:35 +02:00
Aymeric Augustin fe43ad5707 Fixed a small formatting error. 2012-04-30 17:50:32 +02:00
Claude Paroz eefb00f301 Fixed #18220 -- Removed the CACHE_BACKEND setting, as per official deprecation timeline. 
Thanks Ramiro Morales for the review.
 2012-04-29 20:47:36 +02:00
Aymeric Augustin cec6bd5a59 Fixed #18023 -- Removed bundled simplejson. 
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
 2012-04-29 19:58:00 +02:00
Claude Paroz 1858e47672 Fixed #18033 -- Removed function-based generic views, as per official deprecation timeline. Rest in peace! Thanks Anssi Kääriäinen for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-25 19:17:47 +00:00
Claude Paroz eb351ac9cb Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 19:55:52 +00:00
Claude Paroz 23d3459761 Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 08:24:29 +00:00
Paul McMillan 14df122f86 Fixed #17837. Improved markdown safety. 
Markdown enable_attributes is now False when safe_mode is enabled. Documented
the markdown "safe" argument. Added warnings when the safe argument is
passed to versions of markdown which cannot be made safe. Deprecated
versions of markdown < 2.1. Many thanks to ptone for the patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 19:06:23 +00:00
Claude Paroz 21fb1c59c3 Updated some outdated external URLs in docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 07:41:02 +00:00
Claude Paroz 78638a9a51 Replaced http by https in djangoproject.com links 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-13 17:53:31 +00:00
Claude Paroz f5afa22abd Add myself to committers 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-13 17:35:00 +00:00
Adrian Holovaty d694f17536 Made some small edits to localization docs from [17690] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 23:05:16 +00:00
Jannis Leidel db512b4d8c Fixed the localization docs a little to point to the correct Transifex URL. Also reworded it a bit to follow the site's new UI. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 22:00:44 +00:00
Carl Meyer b2dcec228a Fixed broken link. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 17:22:22 +00:00
Aymeric Augustin c0e73a4909 Fixed #9995 -- Updated the installation instructions to recommend pip. Also fixed ReST errors. Refs #9112. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 09:11:54 +00:00
Carl Meyer 60119d4f49 Refs #17800 - Added release notes and deprecation note about SECRET_KEY requirement. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 04:04:56 +00:00