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

9306 Commits

Author SHA1 Message Date
Carl Meyer 4420de89b6 [1.6.x] Fixed #21026 -- Corrected help for manage.py test command. 
Backport of 8f7f8bf688 from master.
 2013-09-03 09:51:17 -06:00
Aymeric Augustin 2a14c08e71 Used six.moves.zip_longest, new in six 1.4.0. 2013-09-03 07:34:45 -05:00
Aymeric Augustin 115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
 2013-09-03 07:34:45 -05:00
Aymeric Augustin 50012577f3 [1.6.x] Updated the bundled version of six to 1.4.0. 
Backport of 42920970 from master.
 2013-09-03 07:34:44 -05:00
Claude Paroz 0514fbb2f3 [1.6.x] Fixed #21003 -- Ensured geometry widget return value has SRID 
Thanks Mathieu Leplatre for the report and initial patch.
Backport of dd656073ad from master.
 2013-09-03 13:55:20 +02:00
Claude Paroz bd0319a261 [1.6.x] Isolated map creation JS code 
Backport of 3550b27a8 from master.
 2013-09-03 13:54:50 +02:00
Claude Paroz b53ce2f31c [1.6.x] Prevented rendering attrs to be squashed in OSMWidget 
Backport of b6889c68d7 from master.
 2013-09-03 10:04:50 +02:00
Claude Paroz aa1c175687 [1.6.x] Fixed syntax error in OSMWidget 
Backport of 6ecbac21a from master.
 2013-09-03 09:08:25 +02:00
Claude Paroz 0c57868908 [1.6.x] Fixed gis test to run on non gis-enabled settings 
Refs #20998.
Backport of 973502c0 from master.
 2013-09-02 14:31:20 +02:00
Claude Paroz 4e3794dd1f [1.6.x] Fixed #20998 -- Allow custom (de)serialization for GIS widgets 
Thanks Mathieu Leplatre for the report and the initial patch.
Backport of 102f26c92 from master.
 2013-09-02 13:34:26 +02:00
Carl Meyer 21a3efcf48 [1.6.x] Fixed #20999 - Allow overriding formfield class with choices, without subclass restrictions. 
Refs #18162. Thanks claudep and mjtamlyn for review.

Backport of 7211741fc5 from master.
 2013-08-30 17:45:14 -06:00
Claude Paroz 1d874ce0f9 [1.6.x] Set 'bidi' Urdu property to True 
Refs #20454.
Backport of e4a67fd90 from master.
 2013-08-30 12:04:17 +02:00
Anssi Kääriäinen 76e38a2177 [1.6.x] Fixed #20988 -- Added model meta option select_on_save 
The option can be used to force pre 1.6 style SELECT on save behaviour.
This is needed in case the database returns zero updated rows even if
there is a matching row in the DB. One such case is PostgreSQL update
trigger that returns NULL.

Reviewed by Tim Graham.

Refs #16649

Backport of e973ee6a98 from master

Conflicts:
	django/db/models/options.py
	tests/basic/tests.py
 2013-08-30 09:47:34 +03:00
Anssi Kääriäinen cd10e998b6 [1.6.x] Removed stale add_q() comment 
Backport of 13be3bfef1 from master
 2013-08-30 09:46:16 +03:00
Tim Graham 10d15f79e5 [1.6.x] Fixed #14786 -- Fixed get_db_prep_lookup calling get_prep_value twice if prepared is False. 
Thanks homm for the report and Aramgutang and lrekucki for work on
the patch.

Backport of f19a3669b8 from master
 2013-08-29 12:14:40 -04:00
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
Claude Paroz 58157be5ad [1.6.x] Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3 
Thanks lvella at gmail.com for the report.
Backport of 169637649 from master.
 2013-08-29 08:43:35 +02:00
Claude Paroz 2c08d474a8 [1.6.x] Fixed #20961 -- Fixed HttpResponse default empty content 
Thanks epandurski at gmail.com for the report.
Backport of f4e980456 from master.
 2013-08-24 18:10:50 +02: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
Claude Paroz ff92a6eb5b [1.6.x] Moved translator comment just above the target string 
Backport of 8cd874298 from master.
 2013-08-22 09:54:35 +02:00
Anssi Kääriäinen 161e26c2ec [1.6.x] Fixed #20955 -- select_related regression 
In cases where the same connection (from model A to model B along the
same field) was needed multiple times in a select_related query, the
join setup code mistakenly reused an existing join.

Backpatch of 8d65b6082c.

Conflicts:

	django/db/models/sql/compiler.py
	tests/queries/tests.py
 2013-08-22 10:59:59 +03:00
Tim Graham 28b1317fd8 [1.6.x] Fixed #20949 -- Typo #2 in docstring 
Backport of 0073f1d94f from master
 2013-08-21 10:50:27 -04:00
Tim Graham b0821e6d3a [1.6.x] Fixed docstring typo, thanks minddust. 
Backport of d3ed15b79d from master
 2013-08-21 09:02:19 -04:00
Florian Apolloner 12d364a9b0 [1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths. 
Backport of 6e846f7627 from master.
 2013-08-20 21:28:14 +02:00
Anssi Kääriäinen 2b1101a4a6 [1.6.x] Fixed #20820 -- Model inheritance + m2m fixture loading regression 
Tests by Tim Graham, report from jeroen.pulles@redslider.net.

Backport of 1ed77e7782 from master
 2013-08-20 17:15:52 +03:00
Simon Charette f0bc2865ff Fixed #20943 -- Weakly reference senders when caching their associated receivers 
Backport of e55ca60903 from master.
 2013-08-20 02:12:50 -04:00
Simon Charette e7a6eaf5fe [1.6.x] Correctly format missing Pillow/PIL exceptions messages. refs #19934 
Backport of b9590a6935 from master.
 2013-08-19 18:51:22 -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
Tim Graham ccff25b143 [1.6.x] Fixed #17778 -- Prevented class attributes on context from resolving as template variables. 
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.

Backport of 71b5617c24 from master.
 2013-08-15 10:22:56 -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 57dc238d0e Bumped version numbers for 1.6b2. 2013-08-13 11:12:07 -05: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
Alex Cucu 80b95a2b1f [1.6.x] Fixed #19918 -- Modified select_for_update to run on the write database. 
Backport of 1c64a0f29e from master
 2013-08-06 10:58:32 -04:00
Tim Heap 891cdf120a [1.6.x] Fixed #20850 -- Added MultiWidget.needs_multipart_form 
Backport of 75c87e2d38 from master
 2013-08-05 10:13:48 -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
Aymeric Augustin 2eac989985 [1.6.x] Fixed #20822 -- Set content type of default error pages to 'text/html'. 
Thanks Jimmy Song for the patch.

Backport of 7843775 from master.
 2013-08-04 11:04:58 +02: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
Aleksandra Sendecka 6e4fd816c4 [1.6.x] Fixed #18777 -- Localized form fields with as_text/as_hidden 
Thanks croldan for the report.

Backport of 893d8de6f5 from master
 2013-08-02 08:43:19 -04:00
Tim Graham 196cc875b2 [1.6.x] Fixed #17519 -- Fixed missing SQL constraints to proxy models. 
Thanks thibaultj for the report, jenh for the patch,
and charettes for the tests.

Backport of aa830009de from master
 2013-08-02 08:42:19 -04:00
Tim Graham b3e54f4a01 [1.6.x] Removed unused model option "admin" 
Backport of 5df84b268d from master
 2013-08-01 12:33:19 -04:00
Baptiste Mispelon badca4716f [1.6.x] Fixed #10491 -- Allowed passing lazy objects to HttpResponseRedirect. 
Thanks liangent for the report.

Backport of 3c45fb8589 from master
 2013-07-30 13:40:18 -04:00
MinRK bf132bcb8d [1.6.x] Added support for IPython.start_ipython in shell 
IPython 1.0 introduces an actual stable public API function
for starting a normal (non-embedded) IPython session.

This is an official public API, which is promised to survive implementation changes.
 2013-07-30 10:24:16 -07: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
Shai Berger 17e632929c [1.6.x] Fixed #20785 -- Corrected exception caught for Oracle LIKE operator detection 
The code that tests to see which LIKE expressions to use now runs
using non-error-wrapped cursor, so cx_Oracle exceptions need to be caught
rather than Django DatabaseErrors.

Thanks Trac user ludo for report and initial patch.
 2013-07-30 03:32:02 +03:00
Florian Apolloner 081a27c358 [1.6.x] Simplified smart_urlquote and added some basic tests. 
Backport of b70c371fc1 from master.
 2013-07-28 10:07:01 +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
Anssi Kääriäinen 7f892cedba [1.6.x] Fixed related model lookup regression 
It has been possible to use models of wrong type in related field
lookups. For example pigs__in=[a_duck] has worked. Changes to
ForeignObject broke that.

It might be a good idea to restrict the model types usable in lookups.
This should be done intentionally, not accidentally and without any
consideration for deprecation path.

Backpatch of 7cca8d56d2 from master.
 2013-07-26 13:17:50 +03: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
Anssi Kääriäinen d439f85bbf [1.6.x] Fixed ._meta.pk_index() virtual field failure 
Backport of 92476e880c from master
 2013-07-25 16:35:04 +03:00
ersran9 7295a8262f [1.6.x] Fixed #20791 -- Reworded ForeignKey default error message 
Backport of 311c1d2848 from master.
 2013-07-23 22:19:02 +02: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
Anssi Kääriäinen 43f1d51b4b [1.6.x] Minor change to get_extra_descriptor_filter() 
Refs #20611. Backpatch of 6b4967e883.
 2013-07-23 15:37:26 +03: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
Claude Paroz 816bf0c6a7 [1.6.x] Fixed #20781 -- Fixed _has_changed regression with MultiValueField 
Thanks Tim Graham for the report.
Backport of 02b0106d from master.
 2013-07-22 09:07:04 +02:00
Claude Paroz 48516d3b85 [1.6.x] Fixed an email validation regression 
Thanks Vincent Wagelaar for the report.
Backport of 11b7b9ad from master.
 2013-07-21 21:12:50 +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
Simon Charette 9d3f7a21a3 [1.6.x] Fixed #20765 -- Set small values of `step` using exponential notation. 
Browsers parse small factors of 10 as 0 under decimal notation.

Thanks to Trac alias matklad for the report and Claude Paroz for the review.

Backport of 415a36947c from master.
 2013-07-19 23:45:29 -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
Tim Graham e5241902f3 [1.6.x] Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases 
Thanks simonpercivall.

Backport of d9c580306c from master
 2013-07-13 17:46:37 -04:00
Claude Paroz db33b25e86 [1.6.x] Fixed #20582 -- Allowed default Form.label_suffix to be translated 
Thanks Tim Graham for the review.
Backport of 7557207983 from master.
 2013-07-13 16:20:09 +02:00
Tim Graham 7f210563ab [1.6.x] Fixed backport of #20740 2013-07-12 18:00:09 -04:00
Tim Graham 45fab74561 [1.6.x] Fixed #20740 -- GenericIPAddressField should pass protocol to formfield() 
Thanks Jeff250.

Backport of f2cb94f1c0 from master
 2013-07-12 16:06:43 -04:00
Shai Berger ae685e54cb [1.6.x] Fixed last_executed_query test failure on Oracle 
Backport of c0a4894dca from master.
 2013-07-09 19:52:16 +02:00
Tim Graham 7788c71890 [1.6.x] Fixed #20722 -- Fixed MemcachedCache backend get_many on Python 3. 
Backport of 3c736207a3 from master
 2013-07-09 11:57:44 -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 0a84cbadb7 [1.6.x] Completed some more name_local names 
Backport of 9383e37a7.
 2013-07-08 12:04:38 +02:00
Mathias Andre ced144155e [1.6.x] Fixed #20716 --Missing 'name_local' translation 
Added 'name_local' translation for Albanian in LANG_INFO
Backport of 8c18f6f61c from master.
 2013-07-08 12:04:10 +02:00
SusanTan 40d2687787 [1.6.x] Fixed #20711 -- Fixed broken link in timesince.py docstring 
Backport of d63327d843 from master.
 2013-07-07 12:40:44 -04: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 d14db25fee [1.6.x] Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for default db. 
Thanks simonpercivall.

Backport of 2cbd579efe from master.
 2013-07-04 20:15:27 -04: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
Tomáš Ehrlich 2f9e5483f6 [1.6.x] Fixed #20687 -- Added documentation for django.core.signing API. 
Thanks Baptiste Mispelon for the suggestion.

Backport of c5bc98d7e1 from master.
 2013-07-03 10:38:53 -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
Aymeric Augustin 02976a46c9 [1.6.x] Introduced getters for connection.autocommit and .needs_rollback. 
They ensure that the attributes aren't accessed in conditions where they
don't contain a valid value.

Fixed #20666.

Backport of dd9c6bc359 from master.
 2013-06-30 16:29:57 +02: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
Claude Paroz 59be2c6875 [1.6.x] Fixed #18592 -- Prevented crash when accessing MySQL _last_executed 
Thanks reames at asymmetricventures.com for the report.
Backport of 59b0c48ce from master.
 2013-06-29 18:48:05 +02:00
Claude Paroz a9b5a1e506 [1.6.x] Do not allow FileSystemStorage.delete to receive an empty name 
Refs #20660.
Backport of 7fbab3eba from master.
 2013-06-29 18:12:23 +02:00
Claude Paroz b6aed803b2 [1.6.x] Fixed #20660 -- Do not try to delete an unset FieldFile 
Thanks stanislas.guerra at gmail.com for the report and
Baptiste Mispelon for the review.
Backport of ea3fe78a9d from master.
 2013-06-29 18:11:51 +02:00
Aymeric Augustin 6908b65939 [1.6.x] Removed obsolete comment. Refs #20079. 
Thanks Gavin Wahl.
 2013-06-29 11:43:41 +02:00
Jacob Kaplan-Moss 70f2d9aaff Updated version numbers and setup.py for 1.6beta. 2013-06-28 08:15:10 -05:00
Shai Berger d097417025 Support 'pyformat' style parameters in raw queries, Refs #10070 
Add support for Oracle, fix an issue with the repr of RawQuerySet,
add tests and documentations. Also added a 'supports_paramstyle_pyformat'
database feature, True by default, False for SQLite.

Thanks Donald Stufft for review of documentation.
 2013-06-28 06:59:10 +03: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
Aymeric Augustin c1284c3d3c Fixed #20571 -- Added an API to control connection.needs_rollback. 
This is useful:
- to force a rollback on the exit of an atomic block without having to
  raise and catch an exception;
- to prevent a rollback after handling an exception manually.
 2013-06-27 22:19:54 +02:00
Andrew Godwin f325f86971 Fixed #20244: PermissionsMixin now defines a related_query_name for M2Ms 2013-06-27 15:44:22 +01:00
Andrew Godwin b21e96d00d Merge pull request #1311 from loic/ticket20619_take2 
Fixed missing initializations in WSGIRequest. Refs #20619
 2013-06-27 07:44:09 -07:00
Andrew Godwin 99b467f272 Add related_query_name to ForeignKey/M2M. Refs #20244 2013-06-27 14:44:21 +01:00
Anton Baklanov cab333cb16 Fixed #20541 -- don't raise db signals twice when creating superuser 2013-06-27 05:58:01 -04:00