innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
15,192 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

2891 Commits

Author SHA1 Message Date
Tim Graham ef1259342b [1.6.x] Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash. 
Thanks chris at cogdon.org for the report and admackin for the patch.

Backport of af953c45cc from master
 2013-08-29 09:45:02 -04:00
Tim Graham 5f061986b9 [1.6.x] Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions 
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.

Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.

Backport of b0ce6fe656 from master
 2013-08-22 17:55:01 -04:00
Harm Geerts a6ac4f90d0 [1.6.x] Fixed #20829 -- Skip postgis metadata tables with introspection 
Backport of 24088618 from master.
 2013-08-16 21:21:41 +02:00
Claude Paroz 1b48de06c3 [1.6.x] Updated translation templates 2013-08-16 15:13:31 +02:00
Tim Graham c769c26601 [1.6.x] Revert "Fixed #18491 -- deleting a proxy doesn't show warning about cascade deletes" 
This reverts commit 2b48fcc607.

It introduced a regression (#20777) which we can't easily fix in 1.6.
 2013-08-16 07:59:16 -04:00
Alasdair Nicol 919934602f [1.6.x] Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value 
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.

Backport of 22c6497f99 from master
 2013-08-15 20:33:02 -04:00
Loic Bistuer 39db994790 [1.6.x] Fixed overflow for the "Recent Actions" widget on the admin index. 
Previously the CSS targeted "li.changelink" and therefore didn't
work for the "add" and "delete" actions.

Refs #14868.

Backport of 33fc083b0d from master
 2013-08-13 13:26:37 -04:00
Jacob Kaplan-Moss bfbae15c66 Apply autoescaping to AdminURLFieldWidget. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:06:00 -05:00
Jacob Kaplan-Moss 79594b40c0 Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S. 
This is a security fix; disclosure to follow shortly.
 2013-08-13 11:05:41 -05:00
Collin Anderson e3e0cf8a0f [1.6.x] Fixed #20865 -- Fixed raw_id_fields to work with callable limit_choices_to. 
Backport of d53e574676 from master
 2013-08-06 13:44:31 -04:00
Tim Graham 90bdb42702 [1.6.x] Fixed backport error in previous commit; refs #15961 2013-08-04 07:30:30 -04:00
Loic Bistuer 9053c6da5f [1.6.x] Moved get_search_results from BaseModelAdmin to ModelAdmin. 
Refs #15961.

Backport of 470a9bb22d from master.
 2013-08-04 07:19:13 -04:00
Tim Graham 97254154ab [1.6.x] Fixed #18923 -- Corrected usage of sensitive_post_parameters in contrib.auth 
Thanks Collin Anderson for the report.

Backport of 425d076d0c from master
 2013-08-02 14:46:51 -04:00
Petr Dlouhý 4e7745cc1c [1.6.x] Fixed LogEntry.get_admin_url() for non-existent models. 
Regression introduced by [369b6fa]; refs #18169.

Backport of 1b47508ac8 from master
 2013-08-02 12:51:46 -04:00
Loic Bistuer 4f8fb19994 [1.6.x] Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer bypasses get_fieldsets(). 
Refs 23e1b59 which already fixed this issue for ModelAdmin and InlineModelAdmin.

Backport of a0ed2f9260 from master
 2013-08-02 10:45:58 -04:00
Harm Geerts b0bde21884 [1.6.x] Fixed #20838 -- Fixed Geodjango spatialrefsys test failure with postgis-2.0.3 
Backport of fd0d486467 from master
 2013-08-02 10:45:27 -04:00
Claude Paroz f942554cf3 [1.6.x] Tweaked proj string regex in gis tests 
Backport of 4367c637d6 from master
 2013-08-02 10:45:12 -04:00
Aymeric Augustin 88e4a3a3d9 [1.6.x] Fixed a test that could fail depending on PASSWORD_HASHERS. 
Thanks Claude. Refs #20760.

Backport of 5b47a9c5a0 from master.
 2013-07-30 16:18:44 +02:00
Tim Graham dbbd2b1272 [1.6.x] Fixed #20805 -- Removed an extra colon beside checkboxes in the admin. 
Thanks CollinAnderson for the report.

Backport of 8676318d2d from master
 2013-07-26 14:47:58 -04:00
Tim Graham 5cc1ea4773 [1.6.x] Updated contrib.admin to use Email/URLInputs; refs #16630 
Backport of 2a979d2a7b from master
 2013-07-26 08:02:10 -04:00
Tim Graham 9abbad491a [1.6.x] Fixed #20679 -- Corrected CachedFilesMixin.post_process docstring. 
Thanks bmispelon for the report.

Backport of 9b88dd3809 from master
 2013-07-25 12:32:38 -04:00
Aymeric Augustin 4525eab077 [1.6.x] Fixed #20760 -- Reduced timing variation in ModelBackend. 
Thanks jpaglier and erikr.

Backport of 5dbca13f3b from master.
 2013-07-23 15:43:43 +02:00
Kirill Fomichev ad898453b7 [1.6.x] Fixed #19019 -- Fixed UserAdmin to log password change. 
Thanks Tuttle for the report.

Backport of 33242fe015 from master
 2013-07-23 08:33:38 -04:00
Claude Paroz 92f66a6134 [1.6.x] Fixed #20773 -- [gis] Fixed regression in GoogleMap output 
Thanks Martyn Clement for the report and the initial patch.
Backport of 27c1a7257 from master.
 2013-07-22 10:03:31 +02:00
Karen Tracey 706e542eb5 [1.6.x] Fixed #13696 -- ensured inline pk field is rendered 
Backport of 3aad955ea8 from master.
 2013-07-21 13:13:20 -04:00
Loic Bistuer c660f0e985 [1.6.x] Fixed #20767 -- Fixed ModelAdmin.preserve_filters for namespaced URLs. 
Thanks Collin Anderson for the report.

Backport of 2fc6c9472c from master.
 2013-07-18 18:23:21 -04:00
Claude Paroz e2c1e9ef55 [1.6.x] Partial revert of commit 2bf403ecbd 
Homework: write 100 times geoapp is not geogapp.
Backport of 57815e2630 from master.
 2013-07-09 14:34:16 +02:00
Claude Paroz a9dd6221af [1.6.x] Fixed #20224 -- Update docs examples which mention __unicode__ 
Thanks Marc Tamlyn and Tim Graham for the review.
Backport of 7442eb1a24 from master.
 2013-07-05 19:30:08 +02:00
Tim Graham 23748c483b [1.6.x] Fixed #20673 -- Clarified that HttpRequest.user uses AUTH_USER_MODEL. 
Thanks littlepig for the report.

Backport of f407f75aae from master.
 2013-07-04 09:34:02 -04:00
Simon Charette 2de0d4c452 [1.6.x] Fixed #20675 -- `check_password` should work when no password is specified. 
The regression was introduced by 2c4fe761a. refs #20593.

Backport of 8759778185 from master.
 2013-07-03 14:12:56 -04:00
Tim Graham 3c51962cab [1.6.x] Updated tests for deprecation of Option.get_(add|change|delete)_permission. 
refs #20642.

Backport of a6a905c619 from master.
 2013-07-01 09:21:07 -04:00
Tim Graham b930733a67 [1.6.x] Fixed #20677 - Typos in generic_inlineformset_factory docs. 
Thanks Riley Strong for the report.

Backport of 3fd0ee5b46 from master
 2013-06-29 14:16:36 -04:00
Aymeric Augustin 6908b65939 [1.6.x] Removed obsolete comment. Refs #20079. 
Thanks Gavin Wahl.
 2013-06-29 11:43:41 +02:00
Tim Graham 534ced5aad Fixed #20664 -- Fixed a bug with raw_id_fields on Python 3. 
Thanks jefftriplett for the report.
 2013-06-27 19:39:20 -04:00
Andrew Godwin f325f86971 Fixed #20244: PermissionsMixin now defines a related_query_name for M2Ms 2013-06-27 15:44:22 +01:00
Anton Baklanov cab333cb16 Fixed #20541 -- don't raise db signals twice when creating superuser 2013-06-27 05:58:01 -04:00
Tim Graham 1184d07789 Fixed #14881 -- Modified password reset to work with a non-integer UserModel.pk. 
uid is now base64 encoded in password reset URLs/views. A backwards compatible
password_reset_confirm view/URL will allow password reset links generated before
this change to continue to work. This view will be removed in Django 1.7.

Thanks jonash for the initial patch and claudep for the review.
 2013-06-26 13:11:47 -04:00
Simon Charette b91787910c Fixed #20642 -- Deprecated `Option.get_(add|change|delete)_permission`. 
Those methods were only used by `contrib.admin` internally and exclusively
related to `contrib.auth`. Since they were undocumented but used
in the wild the raised deprecation warning point to an also undocumented
alternative that lives in `contrib.auth`.

Also did some PEP8 and other cleanups in the affected modules.
 2013-06-25 12:22:37 -04:00
Javier Mansilla f819bef3dc Fixed #19773 - Added admin/popup_response.html template. 
Thanks jimmylam@ for the suggestion.
 2013-06-25 11:20:41 -04:00
Christian Metts c4a0c91459 Itty bitty typo fix. 
"deletes" was missing it's last e.
 2013-06-19 17:45:28 -06:00
Loic Bistuer 7462a78c1b Fixed #20288 -- Fixed inconsistency in the naming of the popup GET parameter. 
Thanks to Keryn Knight for the initial report and reviews,
and to tomask for the original patch.
 2013-06-19 22:16:16 +02:00
Aymeric Augustin ffcf24c9ce Removed several unused imports. 2013-06-19 17:18:40 +02:00
Aymeric Augustin 9da9b3eb04 Merge pull request #1281 from loic/ticket6903 
Fixed #6903 - Preserved admin changelist filters.
 2013-06-18 13:07:28 -07:00
Loic Bistuer c86a9b6398 Fixed #6903 - Preserve admin changelist filters after saving or deleting an object 2013-06-19 02:41:36 +07:00
Erik Romijn aeb1389442 Fixed #20079 -- Improve security of password reset tokens 2013-06-18 20:02:00 +02:00
Erik Romijn 2c4fe761a0 Fixed #20593 -- Allow blank passwords in check_password() and set_password() 2013-06-18 13:32:54 -04:00
Loic Bistuer ee77d4b253 Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields 2013-06-18 08:01:17 -04:00
Baptiste Mispelon 1b7634a0d0 Fixed #20464 -- Added a `total_error_count` method on formsets. 
Thanks to frog32 for the report and to Tim Graham for the review.
 2013-06-16 15:49:30 -04:00
Claude Paroz beb652e069 Worked around Python 3.3 modified exception repr 
Refs #20599.
 2013-06-15 11:14:59 +02:00
Jaap Roes 990f8d92dc Fixed #20599 -- Changed wording of ValueError raised by _load_library 
The _load_library method on BasePasswordHasher turns ImportErrors
into ValueErrors, this masks ImportErrors in the algorithm library.
Changed it to a clearer worded error message that includes
the ImportError string.
 2013-06-15 10:50:55 +02:00