django

Author	SHA1	Message	Date
Tim Graham	a8b70d251d	[1.8.x] Sorted imports with isort; refs #23860 . Backport of `0ed7d15563` from master	2015-02-09 14:24:06 -05:00
chriscauley	66ec9ee441	Fixed #22378 -- Updated \d to [0-9]+ in urlpatterns of docs and tests. Thanks tomwys for the suggestion.	2014-04-16 20:36:29 -04:00
Tim Graham	d73d0e071c	Fixed #22218 -- Deprecated django.conf.urls.patterns. Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.	2014-04-03 07:28:10 -04:00
Athena	5d568bcfa6	Fixed #7571 -- Fixed parameter matching in include()'d urlpattern Fixed URL resolving in the case where an outer regex includes an inner regex and both regexes use positional parameters instead of named groups, causing the outer regex's parameters to override the inner regex's. Modified the regex url resolver so that it will concatenates and then normalizes, instead of normalizing and then concatenating.	2014-03-05 00:35:03 +01:00