mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-13 16:59:35 +00:00
Code Issues 32 Releases Wiki Activity
2,933 Commits 30 Branches 459 Tags
Commit Graph

25 Commits

Author SHA1 Message Date
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
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
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
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
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
Malcolm Tredinnick
58ae80b5ea Changed one of the named endblock tests to test that nesting in the wrong order 
is caught as an error.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4493 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-13 02:54:17 +00:00
Malcolm Tredinnick
a0c354ee4e Fixed #3351 -- Added optional naming of the block in "endblock" tags to ensure 
correct nesting. Thanks for the patch, SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-12 00:22:22 +00:00
Adrian Holovaty
be217bce53 Template system now supports variables whose str() returns a Unicode object with non-ascii characters. Thanks, gabor 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-05 19:48:46 +00:00
Jacob Kaplan-Moss
b1b4e8e7c4 Fixed #2800: the ifchanged tag now can optionally take paramaters to be checked for changing (instead of always using the content). Thanks, Wolfram Kriesing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-11-07 05:36:51 +00:00
Adrian Holovaty
48234a0925 Fixed #2961 -- Added 'opencomment' and 'closecomment' options to {% templatetag %} templatetag. Thanks for the patch, Jeong-Min Lee 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-27 01:58:13 +00:00
Adrian Holovaty
60b46d72ac Fixed #648 -- Added comment syntax to template system: {# #}. Thanks for the patch, mccutchen@gmail.com and Hawkeye 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-24 21:30:38 +00:00
Malcolm Tredinnick
9c0568e21e Fixed #2208 -- Allow empty arguments to be passed to filters. Thanks, mattmcc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 07:26:07 +00:00
Malcolm Tredinnick
bd4c22be0b Fixed #2454 -- Make "ifchanged" tag work more predictably inside nested 
for-loops. Thanks, dummy@habmalnefrage.de.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-23 09:49:58 +00:00
Malcolm Tredinnick
d296e5e565 Fixed #2743 -- Made the value of a cycle tag accessible through the context. 
Patch from Martin Glueck.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-21 13:09:00 +00:00
Russell Keith-Magee
cfe77946d7 Fixes #2637 -- Clarified handling of TEMPLATE_STRING_IF_INVALID, especially with regards to filtering of invalid values. Modified unit tests to test both empty and non-empty values for TEMPLATE_STRING_IF_INVALID. Thanks to SmileyChris for identifying and helping to resolve this bug. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-04 14:02:11 +00:00
Russell Keith-Magee
97b9ad73b4 Refs #2333 - Modified runtests script to use new testing framework. Migrated existing tests to use Django testing framework. All the 'othertests' have been migrated into 'regressiontests', and converted into doctests/unittests, as appropriate. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-27 13:59:47 +00:00