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

1015 Commits

Author SHA1 Message Date
Justin Bronn
aa239e3e54 gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-05 17:15:33 +00:00
Justin Bronn
149e731c3c gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk. 
This includes the newforms-admin branch, and thus is backwards-incompatible.  The geographic admin is _not_ in this changeset, and is forthcoming.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 13:30:47 +00:00
Justin Bronn
5bf3565a26 gis: Merged revisions 7837-7838,7842-7852,7856-7869,7871,7876-7877,7882-7891,7900-7917 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-13 14:31:09 +00:00
Justin Bronn
bc3d6b4908 gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-04 20:16:22 +00:00
Justin Bronn
aef8a8305d gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-7698,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 15:11:55 +00:00
Justin Bronn
842dae0ed5 gis: Merged revisions 7574-7583,7585-7586,7590-7602,7614-7615,7619-7625,7629,7632-7636 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 00:34:17 +00:00
Justin Bronn
a245b72d67 gis: Merged revisions 7545-7546,7548-7561,7563-7565,7567-7569 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-04 17:37:02 +00:00
Justin Bronn
5fd838c4dc gis: Merged revisions 7526,7534-7539 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-18 18:27:22 +00:00
Justin Bronn
5922dabea0 gis: Merged revisions 7499,7501-7502,7504,7509-7510 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-01 00:32:50 +00:00
Justin Bronn
e5b52f90f0 gis: Merged revisions 7485-7491,7493-7497 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-28 14:08:46 +00:00
Justin Bronn
e973fea91c gis: Merged revisions 7458,7471-7473,7476-7478,7480 via svnmerge from trunk. 
This includes all necessary patches for compatibility with queryset-refactor.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-27 17:17:04 +00:00
Justin Bronn
1731135661 gis: Merged revisions 7408-7415,7420-7424,7435 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-22 18:27:02 +00:00
Justin Bronn
b0291347db gis: Merged revisions 7355-7403 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-07 20:29:36 +00:00
Justin Bronn
2efc34dc5e gis: Merged revisions 7280-7353 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-23 17:18:58 +00:00
Justin Bronn
b0a895f9e8 gis: Merged revisions 7181-7277 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 04:05:09 +00:00
Justin Bronn
22e016ff6c gis: Merged revisions 7105-7168 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-28 21:24:51 +00:00
Justin Bronn
d06e33a54d gis: Merged revisions 7044-7102 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-08 20:57:56 +00:00
Justin Bronn
00292ad02e gis: Merged revisions 6990-7043 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-28 15:35:46 +00:00
Justin Bronn
7e322b5908 gis: Merged revisions 6920-6989 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-02 16:57:53 +00:00
Justin Bronn
34560a01da gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,6753,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend base.py due to ikelly's patch in r6905. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-15 01:38:43 +00:00
Jeremy Dunck
23384af79b gis: Merged 6672-6783 vis svnmerge from trunk 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-01 22:12:44 +00:00
Justin Bronn
f66821deae gis: Merged revisions 6614-6671 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 19:13:37 +00:00
Justin Bronn
4ffbddf92d gis: Merged revisions 6525-6613 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-26 20:47:20 +00:00
Justin Bronn
58fc789765 Merged revisions 6442-6524 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-16 16:54:23 +00:00
Justin Bronn
acbc766894 gis: Merged revisions 6394-6441 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-01 03:58:05 +00:00
Justin Bronn
7376474260 gis: Merged revisions 6021-6393 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-20 13:02:11 +00:00
Justin Bronn
cb64f5375c gis: Merged revisions 6000-6020 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-26 17:47:34 +00:00
Justin Bronn
2052b508eb gis: Made necessary modifications for unicode, manage refactor, backend refactor and merged 5584-6000 via svnmerge from [repos:django/trunk trunk]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-26 01:10:53 +00:00
Jeremy Dunck
7d915d5589 gis: Merged revisions 5540-5582 via svnmerge from 
http://code.djangoproject.com/svn/django/trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-01 19:40:39 +00:00
Jeremy Dunck
fc779fe55a gis: Merged revisions 5491-5539 via svnmerge from 
http://code.djangoproject.com/svn/django/trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-25 19:33:37 +00:00
Jeremy Dunck
bdcc95e5cc gis: Merged revisions 4786-5490 via svnmerge from 
http://code.djangoproject.com/svn/django/trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-18 16:48:27 +00:00
Jeremy Dunck
1a657ecf52 gis: Merged revisions 4799-4809 via svnmerge. 
Last revision prior to 0.96 release.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@4853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 16:58:58 +00:00
Jeremy Dunck
fa3ed6e134 gis: Merged revisions 4669-4785 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@4786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-23 16:35:57 +00:00
Jeremy Dunck
5514d87319 gis: Merged revisions 4564-4668 via svnmerge from 
http://code.djangoproject.com/svn/django/trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@4669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-06 14:21:30 +00:00
Jacob Kaplan-Moss
a01f852d2e Fixed documentation from [4558] to be correct. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-23 20:50:53 +00:00
Jacob Kaplan-Moss
36512d5d73 Fixed #343: filters that take strings now handle non-strings correctly. Thanks to Boffbowsh for the original patch, and to SmileyChris for the updated patch and tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-23 18:02:51 +00:00
Adrian Holovaty
2fe6476180 Copy edited new docs in docs/model-api.txt from [4535] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-18 04:44:17 +00:00
Adrian Holovaty
fa159c8de9 Copy edited new docs in docs/request_response.txt from [4534] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-18 04:42:15 +00:00
Malcolm Tredinnick
ed3d787eda Fixed #2568 -- Added documentation for the permalink() decorator. Based on a 
patch from Joeboy.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-17 05:51:45 +00:00
Malcolm Tredinnick
369d9ffa3d Fixed #2906 -- Added documentation about HTTP error code returns and the 
default 404 and 500 code error handlers. Based on a patch from Marc Fargas.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-17 04:59:49 +00:00
Russell Keith-Magee
d6d51c9546 Fixed #3160 -- Added the ability to control the content type in a test client POST request. This is to allow easier testing of json-rpc/xml-rpc/soap etc interfaces. Thanks to Mikeal Rogers for the suggestion, and Ben <afternoon@uk2.net> for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-17 00:23:09 +00:00
Adrian Holovaty
c96d155589 Fixed typo in docs/newforms.txt. Thanks, Jeff Hilyard 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-15 20:55:37 +00:00
Adrian Holovaty
27b28616b4 Created django.contrib.localflavor, for country- and culture-specific functionality. Moved django/newforms/extras/usa.py into there 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-15 05:53:44 +00:00
Adrian Holovaty
6ab41bef13 Made a small improvement to the first overview paragraph in docs/newforms.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-14 23:49:58 +00:00
Adrian Holovaty
26058b98a6 Fixed ReST error in docs/testing.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-14 23:45:45 +00:00
Adrian Holovaty
0518205308 Implemented subclassing Forms in newforms 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-14 23:44:46 +00:00
Adrian Holovaty
c61d7e195f Renamed date_to_format function in docs/templates_python.txt example so as to make it not sound like a conversion function. Thanks, linoj 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 15:44:04 +00:00
Adrian Holovaty
5bed563edf Cleaned up docs/templates.txt 'url' tag documentation from [4494] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 06:13:06 +00:00
Malcolm Tredinnick
ffa0d27462 Fixed #3005 -- Applied trivial docs patch for "oldforms" use of do_html2python. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 05:02:47 +00:00
Malcolm Tredinnick
0fabbf8ce8 Fixed #2606 -- Added tag for working out the URL of a particular view function. 
All work done by Ivan Sagalaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 04:24:58 +00:00