mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity
17,448 Commits 28 Branches 426 Tags 667 MiB
396d65b580
Commit Graph

5291 Commits

Author SHA1 Message Date
Huu Nguyen
f22177a9a3 [1.7.x] Refs #21230 -- removed direct settings manipulation from signed cookies tests 
Backport of b9bfcd82f0 from master
 2014-04-08 12:15:40 -04:00
Alejandro Gómez
5e74d6cf0a [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries. 
Backport of 7a7f6fccae from master
 2014-04-07 08:59:27 -04:00
Simon Charette
7b3a221ad6 [1.7.x] Fixed #22363 -- Correctly serialize django.utils.datetime_safe objects. 
Thanks to linovia for the report.

Backport of 074d3183d9 from master
 2014-04-03 14:56:41 -04:00
Loic Bistuer
6405889a72 [1.7.x] Fixed #22360 -- Fixed two non-deterministic tests in Python 3.4. 
The order of admin's changelist filters in the querystring relied on
dict ordering.

Backport of 4d996b8e69 from master
 2014-03-31 08:24:09 -04:00
Loic Bistuer
5268d71f18 [1.7.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:20:20 -04:00
Loic Bistuer
8e73d3a2c1 [1.7.x] Fixed #22319 -- Fixed migration external dependencies when there are internal dependencies. 
Backport of 0fd51cf0bd from master
 2014-03-31 06:57:44 -04:00
Loic Bistuer
bdec848063 [1.7.x] Fixed #22359 -- Changing M2M field to blank=True failed on sqlite. 
Backport of a449e7feec from master
 2014-03-31 06:35:06 -04:00
Tim Graham
0f9f8738d5 [1.7.x] Fixed #22338 -- Fixed a test dependent on dictionary key iteration order. 
Backport of 69a4f383f6 from master
 2014-03-30 14:27:05 -04:00
Tim Graham
c9014a95bc [1.7.x] Skipped JavascriptI18nTests if Firefox isn't properly configured. 
Code borrowed from django.contrib.admin.tests. Without this, the class can
throw an exception with something like "The browser appears to have exited
before we could connect. The output was: Error: no display specified"

Backport of e2ac0203d9 from master
 2014-03-28 07:30:35 -04:00
Tim Graham
0134d00be5 [1.7.x] Skipped a test that errors rather than marked it as an expectedFailure. 
The test throws an error which Python 3.4 doesn't seem to catch as an
expectedFailure.

refs 7476d96f83

Backport of c170c3761b from master
 2014-03-27 07:01:20 -04:00
Tim Graham
3d74f1f64a [1.7.x] Fixed a deprecation warning on Python 3. 
Backport of c19bbefca2 from master
 2014-03-27 07:01:04 -04:00
Loic Bistuer
39fc8d4b8e [1.7.x] Fixed #22331 -- Made MigrationAutodetector ignore unmanaged models. 
This commit reverts 69d4b1c and tackle the issue from a different angle.
Models remain present in the project state, but are now ignored by the
autodetector.

Backport of 42336c84a0 from master
 2014-03-25 20:04:49 -04:00
Simon Charette
78211b13a5 [1.7.x] Fixed #12030 -- Validate integer field range at the model level. 
Thanks to @timgraham for the review.

Backport of 1506c71a95 from master
 2014-03-25 14:31:54 -04:00
Tim Graham
d84beb3d91 Revert "[1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models." 
This reverts commit bf69375c4d.
 2014-03-25 12:07:37 -04:00
Loic Bistuer
bf69375c4d [1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models. 
Backport of 69d4b1c3ea from master
 2014-03-25 10:34:28 -04:00
David Evans
ddcbde41ee [1.7.x] Fixed #22315 -- str/bytes mismatch in staticfiles 
Previously, `ManifestFilesMixin.read_manifest` failed in Python 3
because `json.loads` accepts `str` not `bytes`.

Backport of 86dcac4634 from master
 2014-03-25 09:55:29 -04:00
Ben Davis
2460484486 [1.7.x] Fixed #22087 -- Made AdminReadonlyField respect ModelForm Meta overrides. 
Backport of 16afffffe8 from master
 2014-03-25 09:34:12 -04:00
Stephen Burrows
b4f165fe94 [1.7.x] Fixed #22300 -- Fixed crash in migrations when changing non-relational field to relational. 
Backport of 35ed792cf2 from master
 2014-03-25 07:46:48 -04:00
Daniel Hahler
21eaad68e6 [1.7.x] Fixed #22293 -- Avoided renaming many-to-many tables to themselves. 
Fixed this for both implementations of _alter_many_to_many, instead of
in `alter_db_table` itself (more implementations).

Backport of 1edfa155e3 from master
 2014-03-24 13:27:06 -04:00
Claude Paroz
d345a030c2 [1.7.x] Fixed #22241 -- Selectively added line breaks in admin read-only fields 
When content is supposed to contain HTML, we do not try to add
line breaks in read-only contents.
Thanks Alexander Todorov for the report.
Backport of c94bff2 from master.
 2014-03-22 17:11:12 +01:00
Patrick Michaud
908bdea482 [1.7.x] Fixed #22256 -- Replaced bad fallback for missing PATH 
Thanks Baptiste Mispelon for the review.
Backport of acee46fc9 from master.
 2014-03-22 16:54:02 +01:00
Claude Paroz
07d4b3c8f2 [1.7.x] Tweaked strip_tags tests to pass on Python 3.3 
Backport of 6a0291bdaf from master.
 2014-03-22 14:44:13 +01:00
Claude Paroz
80f08dbdbc [1.7.x] Improved strip_tags and clarified documentation 
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/
Backport of 6ca6c36f82 from master.
 2014-03-22 11:01:14 +01:00
Tim Graham
caa753ffd6 [1.7.x] Fixed flake8 warnings. 
Backport of 35f46ec7a9 from master
 2014-03-21 06:25:21 -04:00
Dejan Noveski
b74ec85c1d [1.7.x] Fixed #22255 -- Added support for specifying re flags in RegexValidator 
Backport of 4d0c5f6142 from master.
 2014-03-21 11:18:26 +01:00
Alex Gaynor
0cf158cf9a Fixed a small collection of flake8 violations that had snuck in 2014-03-20 10:30:41 -07:00
Andrew Godwin
81f5408c7a Fixed #22275: unique_together broken if ForeignKey split into new file. 
Thanks to bak1an for the patch.
 2014-03-19 21:23:21 -07:00
Andrew Godwin
356f064c49 Merge pull request #2221 from bmispelon/LazyObject-refactor 
Fixed #21840 -- Moved dunder methods from SimpleLazyObject to LazyObject...
 2014-03-19 21:01:24 -07:00
Anubhav Joshi
659b5678fc Fixed #22184 -- Allowed template_tests.tests to be run isolated 2014-03-15 12:34:11 +01:00
Marc Tamlyn
d22b291890 Fixed #22001 -- Ensure db_type is respected. 
db_parameters should respect an already existing db_type method and
return that as its type string. In particular, this was causing some
fields from gis to not be generated.

Thanks to @bigsassy and @blueyed for their work on the patch.

Also fixed #22260
 2014-03-14 22:32:17 +00:00
Baptiste Mispelon
37f7f233f5 Fixed #22272 -- Fixed regression in DecimalField when using decimal_places=0. 
Thanks to trac user merb for the report.
 2014-03-14 17:21:59 +01:00
Claude Paroz
666a2ad22f Merged model_forms_regress with model_forms tests 2014-03-14 15:18:08 +01:00
Claude Paroz
72cfbdc10a Fixed #6103 -- Splitted tests in model_forms tests 2014-03-14 09:44:56 +01:00
Claude Paroz
5a976b4bec Fixed #22245 -- Avoided widget overwrite in forms.IntegerField subclasses 
Thanks Jeroen Pulles for the report and Simon Charette for the review.
 2014-03-13 16:58:14 +01:00
Baptiste Mispelon
61917aa08b Fixed #21840 -- Moved dunder methods from SimpleLazyObject to LazyObject. 
This commit also added tests for LazyObject and refactored
the testsuite of SimpleLazyObject so that it can share
test cases with LazyObject.
 2014-03-13 10:03:01 +01:00
Shai Berger
4b4c704517 Skip test for saving microseconds on backends which do not support it. 2014-03-13 00:28:05 +02:00
Shai Berger
6983201cfb Fixed #20292: Pass datetime objects (not formatted dates) as params to Oracle 
This seems worthwhile in its own right, but also works around an Oracle
bug (in versions 10 -- 11.1) where the use of Unicode would reset the
date/time formats, causing ORA-01843 errors.

Thanks Trac users CarstenF for the report, jtiai for the initial patch,
and everyone who contributed to the discussion on the ticket.
 2014-03-12 23:43:45 +02:00
Shai Berger
fc79c3fb3d Flake8 corrections 2014-03-12 20:34:05 +02:00
Shai Berger
d181384e5f Fixed test failure on Oracle: model_fields.tests.test_float_validates_object 
Failing test introduced in fix for refs #22210.
 2014-03-12 20:17:43 +02:00
Akis Kesoglou
aaad3e27ac Fixed #22217 - ManyToManyField.through_fields fixes. 
- Docs description of arguments mix up.
- Keep it from erroneously masking E332 check.
- Add checks E338 and E339, tweak message of E337.
 2014-03-11 19:33:04 -03:00
Andrew Godwin
f4d91638fc Remove failing test while we fix the underlying bug 2014-03-11 10:33:57 -07:00
Tim Graham
c4f772ed34 Fixed test failures on Windows. 
refs #21092 and 8d7e048a8b
 2014-03-11 10:46:13 -04:00
Chris Beaven
107c9f5453 Fix AlterField migrations that are related to a RenameModel migration 2014-03-11 17:13:26 +13:00
Chris Beaven
40f6ca54f8 Fix autodetector creation of RenameModel migration to capitalize model names 2014-03-11 12:23:45 +13:00
Daniel Pyrathon
819e09b848 Fixed #22210 -- Saving model instances to non-related fields. 
Previously, saving a model instance to a non-related field (in
particular a FloatField) would silently convert the model to an Integer
(the pk) and save it. This is undesirable behaviour, and likely to cause
confusion so the validatio has been hardened.

Thanks to @PirosB3 for the patch and @jarshwah for the review.
 2014-03-10 15:25:18 +00:00
Chris Beaven
7feb70eef3 Fixed #22239 -- Add auto detection of renamed models 2014-03-10 13:55:44 +13:00
Claude Paroz
c564277937 Fixed #22237 -- Removed some warnings in the test suite 
Thanks Aymeric Augustin for the report.
 2014-03-09 22:10:49 +01:00
Aymeric Augustin
3a34f71d4d Removed obsolete hack to run template tests. 2014-03-09 11:07:21 +01:00
Aymeric Augustin
06615d0d6e Avoided leaking warning filters. 2014-03-09 11:07:21 +01:00
Shai Berger
0615eaf24a Corrected a few missed references to old test settings 2014-03-09 08:33:33 +02:00