p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,033 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

15033 Commits

Author SHA1 Message Date
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
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
Aymeric Augustin e73cb6391d Merge pull request #1122 from ambv/issue13285 
Fixed #13285: populate_xheaders breaks caching
 2013-05-18 08:05:48 -07:00
Filipa Andrade 5883ae56b3 Fixed #20142 -- Added error handling for fixture setup 
TestCase._fixture_setup disables transactions so,
in case of an error, cleanup is needed to re-enable
transactions, otherwise following TransactionTestCase
would fail.
 2013-05-18 17:05:45 +02:00
Łukasz Langa 64e11a68f1 Fixed #13285: populate_xheaders breaks caching 2013-05-18 17:03:43 +02:00
Erik Romijn d5ce2ff5e4 Fixed #20444 -- Cookie-based sessions does not include a remote code execution-warning 2013-05-18 16:53:13 +02:00
Aymeric Augustin 3634948c88 Moved IgnorePendingDeprecationWarningsMixin in django.test.utils. 
This mixin is useful whenever deprecating a large part of Django.
 2013-05-18 16:49:15 +02:00
Olivier Sels 63a9555d57 Fixed #19436 -- Don't log warnings in ensure_csrf_cookie. 2013-05-18 16:17:46 +02:00
Aymeric Augustin 7d050e8e9c Merge pull request #1113 from denibertovic/master 
Fixed #18761 -- Added whitespace stripping to URLField and SlugField.
 2013-05-18 07:11:11 -07:00
Deni Bertovic 186ec21a3d Added stripping of whitespace for SlugField and URLField 2013-05-18 16:06:08 +02:00
Claude Paroz 710c59bf9b Slightly reworked imports in contrib.auth.__init__ 2013-05-18 16:01:47 +02:00
Jorge Bastida dc43fbc2f2 Fixed #18998 - Prevented session crash when auth backend removed 
Removing a backend configured in AUTHENTICATION_BACKENDS should not
raise an exception for existing sessions, but should make already
logged-in users disconnect.
Thanks Bradley Ayers for the report.
 2013-05-18 15:58:29 +02:00
Donald Stufft a0c0cc924e Merge pull request #1088 from jacobb/upstream 
#20432: Fix for GroupAdmin test
 2013-05-18 06:53:31 -07:00
Jacob Burch 89955cc35f Fixed #9595 -- Allow non-expiring cache timeouts. 
Also, streamline the use of 0 and None between cache backends.
 2013-05-18 15:39:42 +02:00
Florian Apolloner e0df647143 Merge pull request #1101 from erikr/master 
Fixed argument order for localized_fields to ensure backwards compatibility
 2013-05-18 05:53:14 -07:00
Aymeric Augustin cac7b44571 Merge pull request #1100 from ambv/issue19919 
Fixed #19919: get_language_from_request() disregards en-us and en
 2013-05-18 05:52:09 -07:00
Erik Romijn 1c1695668f Fixed argument order for localized_fields to ensure backwards compatibility 2013-05-18 14:38:45 +02:00
Łukasz Langa 92ebb29c53 Fixes #19919: get_language_from_request() disregards "en-us" and "en" languages 
when matching Accept-Language
 2013-05-18 14:37:04 +02:00
Claude Paroz 90f1170bb9 Fixed #20269 -- Adapted PostGIS template create script for CentOS/RHEL 
Thanks Stephane Benchimol for the report and the initial script and
mfandreas for the patch.
 2013-05-18 14:29:43 +02:00
Zbigniew Siciarz d77082b438 Added example of using sitemaps with static views. 
References #16829.
 2013-05-18 14:27:29 +02:00
Florian Apolloner 16683f29ea Merge pull request #1084 from erikr/master 
Fixed #13546 -- Easier handling of localize field options in ModelForm
 2013-05-18 05:15:15 -07:00
Marc Tamlyn ef73a8eefd Merge pull request #1083 from Markush2010/ticket20235 
Fixes #20235 - MultipleObjectMixin requires object_list in kwargs
 2013-05-18 05:14:28 -07:00
Erik Romijn 756b81dbd1 Fixed #13546 -- Easier handling of localize field options in ModelForm 2013-05-18 14:13:00 +02:00
Matthew Somerville 1c921cfac3 Fixed #20235 -- Use self.object_list if object_list not present in get_context_data kwargs. 
This is so MultipleObjectMixin can be used in the same way as
SingleObjectMixin.
 2013-05-18 14:10:40 +02:00
Aymeric Augustin be826aafac Fixed #20402: removed as-limit from uWSGI example. 
It can fail in hard-to-diagnose ways.
 2013-05-18 13:51:09 +02:00
Senko Rasic b11b036145 Added myself to AUTHORS 2013-05-18 13:49:13 +02:00
Senko Rasic 493aca453a Fixed #11160 - Ensure full_clean is called from non_form_errors 
Updated FormSet.non_form_errors() to ensure full_clean() has
been called before returning the errors.
 2013-05-18 13:44:27 +02:00
Aymeric Augustin 4bed64c417 Made test introduced in 566e284c pass on Python 3. 2013-05-18 13:34:52 +02:00
Aymeric Augustin 06603d112c Merge pull request #1090 from zyegfryed/ticket_20433 
Fixed #20433: extracted catalog compilation code from view.
 2013-05-18 04:30:56 -07:00