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

2623 Commits

Author SHA1 Message Date
Andrew Godwin fd48d2d438 [1.5.x] Rotate CSRF token on login 
Backport of 1514f17aa6 from master
 2013-05-24 22:20:44 +01:00
Claude Paroz 9176fa70c1 [1.5.x] Fixed geojson detection with Spatialite 
This is a partial backport of commit eb9430fc4b. Without this,
geojson support is never detected with Spatialite.
Refs #20252 and #19028.
 2013-04-14 19:08:50 +02:00
Gavin Wahl d1b7bd030b [1.5.x] Fixed spelling errors 
Backport of ec04fd1344 from master
 2013-03-29 08:00:24 -04:00
Claude Paroz ebac592a83 Updated translations from Transifex 
Polish, Telugu, Georgian, Azerbaijani, Norwegian Bokmål, Basque,
Dutch, Thai, Spanish (Argentina), Afrikaans.
 2013-03-28 09:22:57 +01:00
Jacob Kaplan-Moss 87f4860718 [1.5.x] Fixed #20078: don't allow filtering on password in the user admin. 
Backport of 9e462f8101 from master.
 2013-03-27 11:52:40 -05:00
Russell Keith-Magee d35e621633 [1.5.x] Fixed #20048, #20060 -- Modified tests for contrib apps sensitive to custom User models. 
Thanks to matiasb for the report of #20060 and the draft patch for #20048.

(cherry picked from commit 930af661ab)
 2013-03-23 10:02:10 +08:00
Aymeric Augustin 1c9bd69ff0 [1.5.x] Stopped using non-standard __globals__ and __code__ attributes. 
Some alternative implementations don't have them.

Closes #19944.

Backport of 9d4a5b00f1 from master.
 2013-03-17 16:05:55 +01:00
Claude Paroz 101ec4bf8a [1.5.x] Fixed #20036 -- Improved GEOS version string parsing 
Thanks chikiro.spam at gmail.com for the report.
Backport of 747f7d254 from master.
 2013-03-13 09:54:37 +01:00
Claude Paroz 327c98ff08 [1.5.x] Fixed #19933 -- Catched ValueError in get_system_username 
Thanks lanre.hbs at gmail.com for the report.
 2013-03-02 22:45:06 +01:00
Aymeric Augustin 33fc438952 [1.5.x] Fixed #18144 -- Restored compatibility with SHA1 hashes with empty salt. 
Thanks dahool for the report and initial version of the patch.

Backport of 633d8de from master.
 2013-02-25 20:04:26 +01:00
Claude Paroz 3fb98406dc [1.5.x] Updated translations 2013-02-25 14:27:14 +01:00
Jannis Leidel f96dd05542 [1.5.X] Fixed #19850 -- Use configured staticfiles storage to find the URL of a static file in the admin. 2013-02-23 14:42:11 +01:00
Anssi Kääriäinen 96790fc022 [1.5.x] Made a couple of selenium tests wait for page loaded 
The admin_widgets tests were issuing click() to the browser but
didn't wait for the effects of those clicks. This caused the resulting
request to be processed concurrently with the test case. When using
in-memory SQLite this caused weird failures.

Also added wait_page_loaded() to admin selenium tests for code
reuse.

Fixed #19856, backpatch of 50677b29af
 2013-02-21 00:01:07 +02:00
Carl Meyer 0e46c7f7ac [1.5.x] Checked object permissions on admin history view. 
This is a security fix. Disclosure and advisory coming shortly.

Patch by Russell Keith-Magee.
 2013-02-19 10:39:04 -07:00
Carl Meyer a7e33c5bf3 [1.5.x] Added a new required ALLOWED_HOSTS setting for HTTP host header validation. 
This is a security fix; disclosure and advisory coming shortly.
 2013-02-19 10:39:03 -07:00
Claude Paroz 5a803ce10e [1.5.x] Fixed geos test to prevent random failure 
Points in the test fixtures have 20 as max coordinate.
Backport of 87854b0bdf from master.
 2013-02-15 20:15:31 +01:00
Claude Paroz 1b54c85a53 [1.5.x] Avoided unneeded assertion on Python 3 
Fixes failure introduced in 02e5909f7a.
 2013-02-15 16:11:53 +01:00
Claude Paroz 5921f15c11 [1.5.x] Fixed #19807 -- Sanitized getpass input in createsuperuser 
Python 2 getpass on Windows doesn't accept unicode, even when
containing only ascii chars.
Thanks Semmel for the report and tests.
Backport of 02e5909f7a from master.
 2013-02-15 15:51:17 +01:00
Russell Keith-Magee bc6746ac30 [1.5.x] Fixed #19822 -- Added validation for uniqueness on USERNAME_FIELD on custom User models. 
Thanks to Claude Peroz for the draft patch.

(cherry picked from commit f5e4a699ca)
 2013-02-15 09:02:14 +08:00
Carl Meyer f83bec4847 [1.5.x] Fix admindocs on Python 3, where None cannot be sorted with strings. 
This fixes two tests in admin_views which were failing on Python 3, but only if
the tests were run with docutils installed.
 2013-02-12 17:12:44 -07:00
Preston Holmes bb12ea2cf1 [1.5.x] Made modwsgi groups_for_user consistent with check_password 
2b5f848207 based its changes on #19061
that made the is_active attribute mandatory for user models.
The try/except was not removed for the groups_for_user function.

refs #19780
 2013-02-09 09:33:34 -08:00
Claude Paroz b8c6de31a6 [1.5.x] Fixed #19779 -- Checked contrib.sites presence in RedirectFallbackMiddleware 
Thanks Aymeric Augustin for the report and directions for the patch.
Backport of 2ed90eac from master.
 2013-02-08 16:36:57 +01:00
Preston Holmes 830b9fde46 [1.5.x] Fixed #19776 -- Added missing import for backport 
line was present on master from 1520748dac
 2013-02-08 00:28:37 -08:00
Preston Holmes 660f80c3d6 [1.5.x] Fixed #19662 -- alter auth modelbackend to accept custom username fields 
Thanks to Aymeric and Carl for the review.
 2013-02-07 16:08:23 -08:00
Aymeric Augustin 833ccd4b5b [1.5.x] Fixed #19772 -- Handled APPEND_SLASH correctly in the redirects app. 
Backport of 64623a2.
 2013-02-07 22:38:14 +01:00
Claude Paroz 933e956ba4 [1.5.x] Fixed #19745 -- Forced resolution of verbose names in createsupersuser 
Thanks Baptiste Mispelon for the report and Preston Holmes for the review.
Backport of 2390fe3f4 from master.
 2013-02-06 10:06:57 +01:00
Claude Paroz 7a90c6adcc [1.5.x] Updated translations (bn/es/eu/lb/mn) 2013-02-04 21:09:20 +01:00
Claude Paroz f5232597ea [1.5.x] Fixed #19725 -- Made createsuperuser handle non-ascii prompts 
Thanks Michisu for the report.
Backport of 55c585f1c from master.
 2013-02-04 10:11:29 +01:00
Julien Phalip be5369fd24 [1.5.x] Fixed #19333 -- Moved compress.py outside of the admin static folder. Thanks to camilonova, Russell Keith-Magee, Aymeric Augustin and Ramiro Morales for the feedback. 
Backport of c9c40bc6bc
 2013-02-02 15:03:05 -08:00
Nick Sandford e18bd68dbc [1.5.x] Fixed #19445 -- Skip admin fieldsets validation when the ModelAdmin.get_form() method is overridden. 
Backport of 0694d2196f
 2013-02-02 14:55:59 -08:00
Claude Paroz 974909bc9a [1.5.x] Lowered field ordering requirement in ogrinspect test 
This test was randomly failing depending on the library environment.
Backport of a1c470a6f from master.
 2013-02-02 14:02:43 +01:00
Claude Paroz aaf6f39743 [1.5.x] Added missing parentheses in if clause 
Backport of 1f8e7bb07 from master.
 2013-02-02 12:14:53 +01:00
Claude Paroz c39be8b836 [1.5.x] Fixed #18144 -- Added backwards compatibility with old unsalted MD5 passwords 
Thanks apreobrazhensky at gmail.com for the report.
Backport of 63d6a50dd from master.
 2013-02-02 12:03:08 +01:00
Aymeric Augustin 11ec0253ab [1.5.x] Fixed #19692 -- Completed deprecation of mimetype in favor of content_type. 
Thanks Tim for the report and initial patch.

Backport of 89cb771 from master.
 2013-01-31 13:55:00 +01:00
Tim Graham 5da6ce11ed [1.5.x] Fixed typos in docs and comments 
Backport of ee26797cff from master
 2013-01-29 10:58:24 -07:00
Tim Graham dc0bf53276 [1.5.x] Fixed #19477 - Documented generic_inlineformset_factory 
Thanks epicserve for the suggestion.

Backport of 214fb700b9 from master
 2013-01-22 18:18:32 -05:00
Florian Apolloner 5f3c45f745 [1.5.X] Fixed #19596 -- Use `_default_manager` instead of `objects` in the auth app. 
This is needed to support custom user models which don't define a manager
named `objects`.

Backport of cc4de61a2b from master.
 2013-01-22 12:50:40 +01:00
Claude Paroz 1e95d5ba82 Updated contrib apps translations 2013-01-15 17:30:18 +01:00
Claude Paroz 3f9ab5209f Updated localflavor translations 2013-01-15 17:30:18 +01:00
Stephan Jaekel fb130cb40e [1.5.x] Fixed #18026 -- Don't return an anonymous dict if extra_data in storage is empty. 
Backport of 97121cb9 from master.
 2013-01-12 15:51:15 +01:00
Nick Sandford b4544dbd5b [1.5.x] Fixed #19573 -- Allow override of username field label in AuthenticationForm 
Backport of cdad0b28d from master.
 2013-01-10 09:07:06 +01:00
Claude Paroz beef02eeaa [1.5.x] Updated deprecated test assertions 2013-01-08 19:11:40 +01:00
Claude Paroz 3f2f50699e [1.5.x] Updated translation catalogs for core and admin 2013-01-01 16:13:37 +01:00
Julien Phalip fa71536129 [1.5.x] Added further flexibility to ModelAdmin for controlling post-save redirections. 
Refs #19505.
Backport of cee40c7d79
 2012-12-30 23:11:58 -08:00
Anssi Kääriäinen e871e02178 [1.5.x] Made gis get_default_columns mirror changes in normal compiler 
The copy-pasted part of gis compiler's get_default_columns wasn't
changed to match changes in a0155f3534.
 2012-12-30 12:22:26 +02:00
Claude Paroz 4f67ab6376 [1.5.x] Fixed #16408 -- Re-fixed value conversion with Spatialite backend 
Backport of 0907d3c6f from master.
 2012-12-26 12:48:27 +01:00
Julien Phalip 3ad34c231b [1.5.x] Fixed #19505 -- A more flexible implementation for customizable admin redirect urls. 
Work by Julien Phalip.

Refs #8001, #18310, #19505. See also 0b908b92a2.

35d1cd0b28 from master.
 2012-12-24 18:12:13 -03:00
Luke Plant b362a55969 [1.5.x] Made admin generated changelist URLs independent of dict ordering 
Backport of c31c2c92b8 from master
 2012-12-24 02:20:32 +00:00
Ian Clelland 515cf94b60 [1.5.x] Use new TestCase methods for equality comparisons 
Backport of 8d35fd4c32 from master
 2012-12-24 02:19:16 +00:00
Claude Paroz 3aba929bcc [1.5.x] Fixed #19509 -- Fixed crypt/bcrypt non-ascii password encoding 
Also systematically added non-ascii passwords in hashers test suite.
Thanks Vaal for the report.
Backport of 0dc3fc954 from master.
 2012-12-22 16:04:49 +01:00