mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-10 23:39:11 +00:00
Code Issues 32 Releases Wiki Activity
7,283 Commits 30 Branches 459 Tags
Commit Graph

52 Commits

Author SHA1 Message Date
Alex Gaynor
4e25ca00c8 [soc2009/multidb] Merged up to trunk r11864. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-14 17:47:04 +00:00
Alex Gaynor
049dc42bde [soc2009/multidb] Merged in all of Justin Bronn's GIS work. Multidb should now work fully with GIS. This is backwards incompatible, if you are using GIS, your ENGINE setting should now be django.contrib.gis.db.backends.XXX where XXX is the name of your DB backend. Thanks to Justin for all his work. This also resolves merge conflicts from the previous commit. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 02:13:30 +00:00
Alex Gaynor
c88113683d [soc2009/multidb] Merged up to trunk r11810. There are many conflicts in this merge, these will be resolved in a subsequent commit. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 02:10:28 +00:00
Alex Gaynor
bee835fa44 [soc2009/multidb] Merged up to trunk r11804. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-09 17:23:16 +00:00
Alex Gaynor
0ca0ed0453 [soc2009/multidb] Cleaned up the double processing required by validate() by splitting get_db_prep_* functions into db-specific and non-db-specific parts. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-03 06:25:45 +00:00
Alex Gaynor
b8c35f95f4 [soc2009/multidb] Corrected some markup problems in the release notes and added deprecation notes. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:45:51 +00:00
Alex Gaynor
4e36fffab2 [soc2009/multidb] Renaming of database attributes - you now use NAME, ENGINE, etc rather than DATABASE_NAME, DATABASE_ENGINE inside DATABASES. Also deprecates the use of short names (.e.g., `sqlite3` for backends in ENGINE). Patch from Russell Keith-Magee. 
Conflicts:

	docs/releases/1.2.txt

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:45:41 +00:00
Alex Gaynor
f2604c331d [soc2009/multidb] Updated testing services to handle multiple databases better. Includes extra tests (some failing) for multiple database support. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:42:56 +00:00
Alex Gaynor
e9e73c4b68 [soc2009/multidb] Merged up to trunk r11756. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-21 06:55:11 +00:00
Alex Gaynor
2bc7422b52 [soc2009/multidb] Updated to trunk r11603. This includes a critical security fix. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 22:16:10 +00:00
Alex Gaynor
6f983870f3 [soc2009/multidb] Merged up to trunk r11467. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-18 05:17:59 +00:00
Alex Gaynor
2899accd26 [soc2009/multidb] Merged up to trunk r11413. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 02:39:23 +00:00
Alex Gaynor
7cf6fd8d61 [soc2009/multidb] Resolved a strange merge conflict. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-31 18:31:55 +00:00
Alex Gaynor
1a98f6ff26 [soc2009/multidb] Updated to trunk r11371. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-31 18:29:06 +00:00
Alex Gaynor
0536cb98d5 [soc2009/multidb] Merged up to trunk r11267. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-19 21:31:13 +00:00
Alex Gaynor
bc3cd5d952 [soc2009/multidb] Merged up to trunk r11068 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 17:03:52 +00:00
Alex Gaynor
fdd5ff646e [soc2009/multidb] Updated the contributing documentation for the settings changes 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 03:06:13 +00:00
Alex Gaynor
bce55b1aa8 [soc2009/multidb] Implemented a connections object that is responsible for tracking multiple database connections and lazily instantiating them. Also implemneted the DATABASES setting which replaces the various DATABASE_* settings 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 01:58:33 +00:00
Karen Tracey
50745cc31e Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:45:28 +00:00
Jacob Kaplan-Moss
da17a314ca Fixed a silly typo in my bio. How embarrassing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-10 17:09:09 +00:00
Jacob Kaplan-Moss
ec4cf19700 Updated my bio. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-10 16:33:52 +00:00
Gary Wilson Jr
1eccb1c6aa Fixed #10577 -- Fixed doc typo, patch from Zoramite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 15:39:32 +00:00
Russell Keith-Magee
638dbc3e83 Fixed #6464 -- Added incr() and decr() operations on cache backends. Atomic on Memcache; implemented as a 2 stage retrieve/update on other backends. Includes refactor of the cache tests to ensure all the backends are actually tested, and a fix to the DB cache backend that was discovered as a result. Thanks to Michael Malone for the original patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-11 13:27:03 +00:00
Russell Keith-Magee
ff4b844cb4 Added a link to RKM's blog in the committers file. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-03 05:04:12 +00:00
Karen Tracey
453d452653 In the release process doc, clarify that the original committer is responsible for backporting trunk fixes to the bug-fix branch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-08 17:15:56 +00:00
Karen Tracey
8d28a4c853 Quit being a complete mystery. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-13 23:43:25 +00:00
Malcolm Tredinnick
08c3ad0cd0 Added a link to the "documentation" documentation in the contributing docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-07 11:49:50 +00:00
Malcolm Tredinnick
777aaf0333 Added a note about where custom manager specifications go in a model (for the 
style guide).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-07 11:48:11 +00:00
Jacob Kaplan-Moss
af68a0ccd8 Fixed heading levels in docs/internals/committers 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-19 19:45:54 +00:00
Jacob Kaplan-Moss
de9acabf12 Updated contributing documentation to contain the new release process and updated information about branches using DVCSes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-19 19:44:10 +00:00
Adrian Holovaty
1b58b77f0d Edited docs changes from [9010] and [9011] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-11 03:32:28 +00:00
Simon Willison
1c78bf4b98 Small documentation tweaks, fixes #9000 - thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-11 02:43:32 +00:00
Adrian Holovaty
8be80c2380 Fixed #8996 -- Fixed small typo in documentation.txt. Thanks, rduffield 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-10 04:04:57 +00:00
Simon Willison
698dbb63e0 I am not a lolcat 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-05 17:40:30 +00:00
Luke Plant
7982519477 Added bio for myself 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-05 15:39:58 +00:00
Luke Plant
a5bf0af67c Fixed typo in my name 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-05 14:07:17 +00:00
Simon Willison
c19d2dd8f7 Cleaned up some whitespace 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 21:22:49 +00:00
Simon Willison
00dcd49ffb I'm not working for the Guardian just yet - not until October 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 21:21:24 +00:00
James Bennett
cdffe90c8a And now we don't need that redundant extra sentence 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:57:46 +00:00
James Bennett
d6f94676cb Fix my bio 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:56:26 +00:00
Jacob Kaplan-Moss
ee28ee9311 Fixes #8847 - a bunch of cleanups to the i18n docs. Thanks, ramiro! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:52:20 +00:00
Malcolm Tredinnick
8df158048c Typo fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:41:21 +00:00
Brian Rosner
dd75469d4f Added my location to the committer details. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:35:31 +00:00
Brian Rosner
26dd79c8aa Updated my entry on the committers documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:30:52 +00:00
Russell Keith-Magee
d302be429b Corrected some minor typos in the committers details. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:21:31 +00:00
James Bennett
c5d56be365 Fixed a small typo in docs/internals/committers.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:14:57 +00:00
Jacob Kaplan-Moss
9d5e77d26d Cleaned up the list of authors/contributors so that people actually working on Django get some props. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 19:58:21 +00:00
Jacob Kaplan-Moss
58e3ef76db Updated API stability document for 1.0. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 18:45:33 +00:00
Jacob Kaplan-Moss
64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 03:40:42 +00:00
Malcolm Tredinnick
c0b53b3dcc Removed the need for ROOT_URLCONF in settings when running Django's core tests 
(via runtests.py). It was embarrassing having to explain the need for it to
people, since we ignore whatever setting is passed in.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 05:09:03 +00:00