29d1abbe35
Merge remote-tracking branch 'django/master' into t3011
2012-09-24 07:49:46 +08:00
8a527dda13
Ensure sequences are reset correctly in the presence of swapped models.
2012-09-24 07:48:05 +08:00
3174b5f2f5
Fixed #18982 - Caught TypeError in DateField.clean
...
Thanks gwahl at fusionbox com.
2012-09-23 13:27:01 +02:00
0229209c84
Merged recent Django trunk changes.
2012-09-23 14:50:11 +08:00
8599f64e54
Fixed #18861 -- Triggered message validation with locmem email backend
...
Thanks Bruno Renié for the report and the initial patch.
2012-09-22 15:17:13 +02:00
822cfce3df
Fixed #18951 -- Formatting of microseconds.
...
Thanks olofom at gmail com for the report.
2012-09-22 12:02:21 +02:00
baa33cd8fa
Fixed #16218 -- date_list order in generic CBVs.
...
Thanks nnrcschmdt for the report and bpeschier for the initial
version of the patch.
2012-09-22 11:47:34 +02:00
26ff2be787
Imported getLogger directly from logging module
...
This was a remainder of some 2.4 compatibility code.
2012-09-20 21:03:24 +02:00
4e9a74b81d
Revert "Fixed #16865 -- Made get_or_create use read database for initial get query."
...
Thanks to Jeremy Dunck for pointing out the problem with this change. If in a
single transaction, the master deletes a record and then get_or_creates a
similar record, under the new behavior the get_or_create would find the record
in the slave db and fail to re-create it, leaving the record nonexistent, which
violates the contract of get_or_create that the record should always exist
afterwards. We need to do everything against the master here in order to ensure
correctness.
This reverts commit 901af86550
2012-09-19 11:15:12 -06:00
901af86550
Fixed #16865 -- Made get_or_create use read database for initial get query.
...
Thanks Rick van Hattem for the report and trbs for the patch.
2012-09-19 10:06:53 -06:00
40e62a5ccd
Fixed #18980 -- Fixed assertContains regression when passed an object
2012-09-18 21:05:41 +02:00
319e135519
Fixed #18800 -- Support numbers bigger than max float in `numberformat`.
...
Thanks to jbvsmo for the patch and Brad Pitcher for the tests.
2012-09-18 19:43:50 +02:00
23d0136314
Merge branch 'lotheac-fix_uploaded_file_exec'
2012-09-17 22:54:26 +02:00
e8c6aff3bf
Fixed #18947 -- Don't make uploaded files executeable by default.
...
Thanks to Lauri Tirkkonen for the patch.
2012-09-17 22:53:10 +02:00
6494bf91f2
Improved validation of swappable model settings.
2012-09-17 21:38:44 +08:00
a630d08483
Merge pull request #360 from calebsmith/add-permalink-wraps-test
...
Ticket #12836 - Added a test to assure permalink wraps method attributes
2012-09-16 14:00:51 -07:00
f399a804c9
Fixed #17485 regression -- only + select_related interaction
...
When doing deeper than one level select_related() + only queries(), the
code introduced in b6c356b7bb
2012-09-16 22:58:40 +03:00
913e1ac84c
Added test for proxy model safeguards on swappable models.
2012-09-16 20:12:34 +08:00
280bf19e94
Merge remote-tracking branch 'django/master' into t3011
2012-09-16 18:16:49 +08:00
c555741aa7
Fixed #18530 -- Fixed a small regression in the admin filters where wrongly formatted dates passed as url parameters caused an unhandled ValidationError. Thanks to david for the report.
2012-09-15 16:20:56 -07:00
b1fb6f4820
Modernized views.DebugViewTests
2012-09-15 21:07:42 +02:00
57ac6e3d32
Merge remote-tracking branch 'django/master' into t3011
2012-09-15 14:31:54 +08:00
859aa2a6c4
Fixed #18790 -- Encoded database password on Python 2
...
Thanks thcourbon@gmail.com for the report.
2012-09-12 10:16:49 +02:00
f1bdfbd24b
Document and test 'type' usage in Widget attrs
...
Refs #16630 .
2012-09-10 19:31:11 +02:00
2e92858386
Fixed a couple of test failures on Windows.
2012-09-09 15:07:04 -04:00
f2ec915b20
Merge remote-tracking branch 'django/master' into t3011
2012-09-09 08:29:51 +08:00
19526563b5
Merge recent changes from master.
2012-09-09 08:22:26 +08:00
a3b2136b28
Remove an outdated import inadvertently introduced in tests.
2012-09-08 18:22:03 -06:00
2c5e833a30
Corrected admin_views tests following removal of the email fallback on admin logins.
2012-09-09 07:53:46 +08:00
a78dd109e6
Fixed #15552 -- LOGIN_URL and LOGIN_REDIRECT_URL can take URLpattern names.
...
Thanks UloPe and Eric Florenzano for the patch, and Malcolm Tredinnick for
review.
2012-09-08 16:58:35 -06:00
307706d082
Fixed #18545 -- Make the 'no DJANGO_SETTINGS_MODULE' error message more useful.Thanks Nick Coghlan for the report, and Malcolm Tredinnick for review.
2012-09-08 14:26:33 -06:00
4754f122dd
Moved the admin inline JS to new JS files for cleanliness.
2012-09-08 15:09:37 -04:00
210fd7c658
refs #12836 - Added a test to assure permalink wraps method attributes
2012-09-08 11:58:48 -04:00
ccd1bb0d81
Remove Admin's swallowing of AttributeError ( #16655 , #18593 , #18747 )
...
During the new-admin changes, catching of AttributeError was added to
the admin. This patch removes that as it's no longer possible to add a
value to a ModelAdmin that is not available. Adding an attribute that
can not be called causes an ImproperlyConfigured exception to be raised.
2012-09-08 11:20:05 -04:00
9b07b5edeb
Fixed #18916 -- Allowed non-ASCII headers.
...
Thanks Malcolm Tredinnick for the review.
2012-09-07 19:08:57 -04:00
b865009d41
Fixed #12397 -- allow safe_join to work with the root file system path, which means you can have your root template or file upload path at this location. You almost certainly don't want to do this, except in *very* limited sandboxed situations.
2012-09-07 16:49:22 -04:00
5999eb42eb
Removed another usage of the bear "except:" (rawr!).
2012-09-07 15:34:48 -04:00
335a9f9cf1
Removed many uses of bare "except:", which were either going to a) silence real issues, or b) were impossible to hit.
2012-09-07 15:08:07 -04:00
6a5a12ea3e
Fixed #17888 -- no longer silence exceptions inside of check_test. Thanks to brutasse for the patch.
2012-09-07 14:37:21 -04:00
a92b81b0e8
Fixed tests that I broke a few commits ago.
2012-09-07 14:01:46 -04:00
f47af9df1d
Cleaned up several test cases, to better isolate state.
2012-09-07 13:47:12 -04:00
292322f977
[py3k] Silence many warnings while running the tests.
2012-09-07 13:17:34 -04:00
7e82e83d67
Merged master changes.
2012-09-07 23:45:03 +08:00
0e296131bb
Cleaned up some small bits of the ORM, including removing an import *.
2012-09-07 10:58:17 -04:00
5262a288df
Fixed #18687 : Removed test_performance_scalability
...
Even after repeated adjustment of the constants, this test still fails
randomly. It has educated us to ignore messages from Jenkins, to a
point where we missed some actual failures. In addition, it accounts
for a non-negligible percentage of the run time of the test suite
just by itself. Since no one has proposed a convincing patch in months,
I'm going to remove the patch. We can't keep a randomly failing test
forever.
2012-09-05 23:02:33 -04:00
22f85b9057
Fixed #18824 -- Allow deleting a setting from overriden settings
2012-09-04 09:41:12 +02:00
cc9b767fc6
Fixed #18902 -- Made force_bytes properly handle exception input
...
Thanks Aymeric Augustin for the report and the initial patch.
2012-09-04 09:27:28 +02:00
28fd876bae
Fixed #17892 -- Do not include whole RegexURLPattern lists in RegexURLResolver repr
...
Thanks milosu for the report and the initial patch.
2012-09-01 22:20:46 +02:00
306d34873c
Fixed #18212 -- Standardized arguments of GenericIPAddressField
...
Unlike other model fields, the newly introduced (1.4)
GenericIPAddressField did not accept verbose_name and name as the
first positional arguments. This commit fixes it.
Thanks Dan McGee for the report and the patch.
2012-09-01 18:38:55 +02:00
879b245baa
Fixed #5725 -- Fixed varchar column size introspection for MySQL
...
Thanks ferdonline for the initial patch and Karen Tracey for the
related post on django-users.
2012-08-30 19:28:13 +02:00
Russell Keith-Magee
Aymeric Augustin
Claude Paroz
Carl Meyer
Jeremy Dunck
Florian Apolloner
Florian Apolloner
Anssi Kääriäinen
Julien Phalip
Karen Tracey
Travis Swicegood
Caleb Smith
Travis Swicegood
Alex Gaynor