mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity
15,676 Commits 28 Branches 423 Tags 636 MiB
Commit Graph

15676 Commits

Author SHA1 Message Date
Tim Graham cc62cbed76 Fixed some line wrapping, refs #20233 2013-05-19 06:51:55 -04:00
Łukasz Langa 26e3e7ecb5 Fixed #11915: generic Accept-Language matches country-specific variants 2013-05-19 12:50:09 +02:00
Senko Rasic 65c557115f fix warnings imports in fixtures tests 2013-05-19 12:49:03 +02:00
Honza Kral 4ad1eb1c14 Fixed #12674 -- provide a way to override admin validation 
Moved admin validation code to classes and have those be class
attributes to the ModelAdmin classes.
 2013-05-19 12:42:52 +02:00
Andrew Godwin 264f8650e3 ModelState now freezes options and bases 2013-05-19 12:35:17 +02:00
Marc Tamlyn 886f7cc751 Merge pull request #1098 from zsiciarz/ticket-16829 
Added example of using sitemaps with static views.
 2013-05-19 03:27:33 -07:00
Andrew Godwin d58c98d73c Fix proxy objects to respect != 2013-05-19 12:27:17 +02:00
Aymeric Augustin 753edfa4b5 Fixed a rest mistake I introduced in d5ce2ff. 2013-05-19 12:14:44 +02:00
Marc Tamlyn 9a1ea4e7e8 Merge pull request #1147 from ambv/transrealmixin 
Added TransRealMixin to fix i18n global state pollution in the test suite
 2013-05-19 03:13:17 -07:00
Łukasz Langa e80636b668 Added TransRealMixin to fix i18n global state pollution in the test suite 2013-05-19 12:05:57 +02:00
bbjay 56d6fdbbf5 Fixed #20452 -- Rename 'headers' to 'header fields'. 2013-05-19 11:48:57 +02:00
Senko Rasic c44a2c40fe Fixed #18990 -- Loaddata now complains if fixture doesn't exist 
If the fixture doesn't exist, loaddata will output a warning.

The fixture named "initial_data" is exceptional though; if it
doesn't exist, the warning is not emitted. This allows syncdb and
flush management commands to attempt to load it without causing
spurious warnings.

Thanks to Derega, ptone, dirigeant and d1ffuz0r for contributions
to the ticket.
 2013-05-19 11:31:27 +02:00
Marc Tamlyn 413735b239 Fix a typo in a comment. 2013-05-19 11:24:36 +02:00
Marc Tamlyn d9c01da1f8 Improve cookie based session backend docs. 
Note the don't require sessions to be in installed apps.
 2013-05-19 11:24:35 +02:00
Andrew Godwin 2d0e36ae37 Merge pull request #1142 from Pike/master 
Fixed #20454: Make Urdu (ur) recognized as RTL language
 2013-05-19 02:23:20 -07:00
Andrew Godwin cf56536ac7 Merge pull request #1145 from postrational/ticket_20233 
Fixed #20233 - Full custom user model example isn't really full
 2013-05-19 02:00:50 -07:00
Senko Rasic cc3b3ba93a Fixed #18990: Loaddata now complains if fixture doesn't exist 
The fixture named "initial_data" is exceptional though; if it
doesn't exist, the error is not raised. This allows syncdb and
flush management commands to attempt to load it without causing
an error if it doesn't exist.
 2013-05-19 10:56:09 +02:00
Marc Tamlyn 726e576794 Merge pull request #1143 from AndreaCrotti/master 
A simple docstring to clarify a part of the code that might be confusing to understand
 2013-05-19 01:52:33 -07:00
postrational 0b3a6ead88 refs #20233 - Full custom user model example isn't really full 
Addition and fix for custom user model example documentation.

https://code.djangoproject.com/ticket/20233
 2013-05-19 10:48:30 +02:00
Marc Tamlyn 6fef4be632 Merge pull request #1141 from inglesp/typo 
Typo in comment
 2013-05-19 01:39:09 -07:00
Marc Tamlyn 33c361ef9d Merge pull request #1129 from frog32/master 
Add needed Imports to the Documentation
 2013-05-19 01:37:25 -07:00
Andrea Crotti 5124ab7620 add comment to explain why it's necessary to do an explicit check for 
Python2 and how metaclasses are defined
 2013-05-19 10:36:04 +02:00
Marc Tamlyn c70ca4879e Merge pull request #1116 from elektrrrus/ticket_20234_20236 
Ticket 20234 20236
 2013-05-19 01:32:41 -07:00
Axel Hecht 004fde0702 Make Urdu (ur) recognized as RTL language. Refs #20454 2013-05-19 11:29:24 +03:00
Peter Inglesby cafcc22b01 Typo in comment 2013-05-19 09:28:36 +02:00
Ramiro Morales 0a50311063 Fixed #20004 -- Moved non DB-related assertions to SimpleTestCase. 
Thanks zalew for the suggestion and work on a patch.

Also updated, tweaked and fixed testing documentation.
 2013-05-18 19:04:34 -03:00
Claude Paroz 69523c1ba3 Updated contrib.humanize translation template 2013-05-18 23:11:39 +02:00
Emil Stenström 7d77e9786a Fixed #20246 -- Added non-breaking spaces between values an units 2013-05-18 23:01:48 +02:00
Tome Cvitan caf56ad174 Fixed #20440 -- Ensured CharField's max_length/min_length are integers 2013-05-18 22:30:24 +02:00
Karol Sikora 3eba8c7f7f Fixed #20234 and #20236 -- SingleObjectMixin fixes 
Added object on SingleObjectMixin returned context,
some code clanup.
 2013-05-18 21:13:27 +02:00
Aymeric Augustin 0038296135 Fixed ff881aef on Python 3. 2013-05-18 20:48:47 +02:00
Marc Egli a4a761ada2 add Leandra Finger, Silvan Spross and Marc Egli to AUTHORS 2013-05-18 18:39:28 +02:00
leandrafinger ddd9ee16fa Add missing imports to the examples in the 'First Steps' 2013-05-18 18:39:21 +02:00
Silvan Spross cd72c55d86 Add missing imports and models to the examples in the view layer documentation 2013-05-18 18:39:11 +02:00
Marc Egli e4591debd1 Add missing imports and models to the examples in the the model layer documentation 2013-05-18 18:38:52 +02:00
Andrew Godwin 38a8cf1cdc Fix state tests a little 2013-05-18 18:30:34 +02:00
Shai Berger ff881aef53 Fixed #13958 -- problem reporting exception from \r-line-ended file 
Thanks petrvanblokland for reporting and saz for the patch
 2013-05-18 19:30:03 +03:00
Tim Graham 2c84f4434c Fixed #20284 - Added a note about DEBUG in static file docs. 
Thanks wim@ for the suggestion and Nicolas Noé for the patch.
 2013-05-18 12:11:29 -04:00
Donald Stufft 2335fdd077 Merge pull request #1135 from ambv/model_validation_fix 
Fixes a Python 3.x regression introduced in a19e9d80
 2013-05-18 09:11:06 -07:00
Łukasz Langa f763227c7d Fixes a Python 3.x regression introduced in a19e9d80 2013-05-18 18:06:31 +02:00
Aymeric Augustin 5915800deb Merge pull request #1127 from filias/20142 
Fixed #20142 -- Added error handling for fixture setup
 2013-05-18 08:42:36 -07:00
Florian Apolloner dc8814bf7d Merge branch 'master' of github.com:django/django 2013-05-18 17:39:14 +02:00
Łukasz Langa bd97f7d0cb Fixed #15201: Marked CACHE_MIDDLEWARE_ANONYMOUS_ONLY as deprecated 2013-05-18 17:38:32 +02:00
Florian Apolloner acd0bb39df Fixed #14894 -- Ensure that activating a translation doesn't run into threading issues. 
Thanks to maxbublis for the report and sergeykolosov for the patch.
 2013-05-18 17:36:31 +02:00
Diederik van der Boor 86e761fee8 Fix NoneType error when fetching a stale ContentType with get_for_id 
When a stale ContentType is fetched, the _add_to_cache() function
didn't detect that `model_class()` returns `None` (which it does by
design). However, the `app_label` + `model` fields can be used instead
to as local cache key. Third party apps can detect stale models by
checking whether `model_class()` returns `None`.

Ticket: https://code.djangoproject.com/ticket/20442
 2013-05-18 17:31:28 +02:00
Donald Stufft 398841d6d3 Merge branch 'allow-any-iterable-for-choices' 2013-05-18 11:31:16 -04:00
Tim Graham 78de9b1902 Merge pull request #1128 from erikr/improve-smallint-docs 
Fixed #20446 -- Documentation for SmallIntegerField does not clarify 'small'
 2013-05-18 08:28:20 -07:00
Tim Graham 96cabba808 Fixed #20335 - Documented the {% language %} template tag. 
Thanks bmispelon for the suggestion and djangsters for the patch.
 2013-05-18 11:20:02 -04:00
Erik Romijn 56e2f6ccae Fixed #20446 -- Documentation for SmallIntegerField does not clarify 'small' 2013-05-18 17:16:07 +02:00
Donald Stufft a19e9d80ff Fixed #20430 - Enable iterable of iterables for model choices 
Allows for any iterable, not just lists or tuples, to be used as
the inner item for a list of choices in a model.
 2013-05-18 11:14:05 -04:00