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

10627 Commits

Author SHA1 Message Date
Tim Graham 2f2d21fe5c [1.7.x] Fixed typo in docstring. 
Backport of 029d77eaaa from master
 2014-03-31 07:01:27 -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
Aymeric Augustin 18b2c03ea3 [1.7.x] Increased memoization cache size for language codes. 
There may be more than 100 (default maxsize) commonly seen xx-yy values
on some sites. The additional memory consumption isn't significant.

Also added a comment explaining why this cache must have a maxsize.

Backport of f356b6e from master.
 2014-03-29 19:47:47 +01:00
Anssi Kääriäinen a6a0800579 [1.7.x] Fixed #22250 -- regression in gis compiler for non-concrete fields 
Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e66e from master
 2014-03-29 08:28:43 +02:00
Chris Beaven fe61ba91c7 [1.7.x] Add a useful stacklevel to some RemovedInDjango19Warnings 
Backport of b077ba7ac1 from master
 2014-03-27 06:11:01 -04:00
Simon Charette 4678efd3f1 [1.7.x] Fixed the PostGIS circular imports caused by 1506c71a95. 
Thanks to @loic for the help and @timgraham for the review.

refs #12030.

Backport of b9e50e4774 from master
 2014-03-26 13:02:52 -04:00
Tim Graham 4bd7411edf [1.7.x] Fixed Python 3.4 test failure. 
Backport of 45ef4baf5c from master
 2014-03-26 10:11:12 -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 81d3d48b5e [1.7.x] Fixed field deconstruction tests failures introduced by 1506c71a95. 
refs #12030.

Backport of ff874f363c from master
 2014-03-25 19:30:33 -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 7eaf329ad3 [1.7.x] Fixed #22322 -- Fixed incorrect explanation of what managed=False does. 
refs #14305.

Thanks Adrian Klaver for the report.

Backport of 9b7ba8af1b from master
 2014-03-25 14:03:02 -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
Jannis 345281b880 [1.7.x] Fixed typo in error message in django.contrib.sitemaps. 
Backport of d81a9c50d8 from master
 2014-03-24 13:06:58 -04:00
Tim Graham 70b34f095c [1.7.x] Updated six to 1.6.1. 
Backport of 2ec82c7387 from master
 2014-03-24 07:34:18 -04:00
Alex Gaynor 6d254e5a97 [1.7.x] Removed an unused variable. 
Backport of 684e8a941b from master
 2014-03-22 13:17:51 -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 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
Antti Hirvonen 0c19383a1f [1.7.x] Fixed #22302 -- Updated Finnish locale formats 
Backport of aaa2110259 from master.
 2014-03-22 10:55:10 +01: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
James Bennett dda6224459 [1.7.x] Bump version numbers for 1.7 beta 1. 2014-03-20 19:42:11 -05:00
Aymeric Augustin 222262ca23 Fixed #22163 -- Stopped ignoring unhandled kwargs in select_for_update. 2014-03-20 22:22:00 +01:00
Andrew Godwin 831ce69cbb Mark model renaming as irreversible for now (#22248) 2014-03-19 21:25:26 -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
Eric Palakovich Carr c11b9346d4 Fixed migration so MySQL GIS test doesn't fail; refs #22001. 
The test previously failed with the error:
(1170, "BLOB/TEXT column 'name' used in key specification without a key length")
 2014-03-19 06:49:29 -04:00
smallcode 61fdb8d487 Fixed regression in file locking on some platforms. 
Some platforms with os.name == 'posix' do not have the
fcntl module, e.g. AppEngine.

refs #19373.
 2014-03-18 10:35:22 -04:00
Florian Apolloner 8520e43e13 Fixed a regression from 2e5b82f627 2014-03-18 15:30:52 +01:00
Florian Apolloner 2e5b82f627 Made a test app label unique. 2014-03-18 14:51:06 +01:00
Daniel Hahler fc167c9b5e Mentioned that ``dumpdata --natural`` is deprecated. 2014-03-18 07:25:37 -04:00
Matthew Somerville 61296fb1ba Fixed #22283 -- Updated documentation referring to non-existent tuples. 2014-03-18 10:57:47 +01:00
Chris Beaven b47ef04ea2 Fix any sqlite field migration deleting all implicit m2m tables 
Fixes #22281
 2014-03-18 16:54:35 +13:00
Marc Tamlyn 834d78ffc3 Remove u prefixes, skip test unless spatial db. 
Refs #22001, d22b291890
 2014-03-15 12:49:03 +00:00
Russell Keith-Magee bb2c58c701 Merge pull request #2430 from NathanRSmith/ticket_21989 
Fixed #21989 - Modified first day of week in AU locale.

Although Australia is a signatory to ISO 8601, there's a lot of evidence to suggest that this is in the same category as "officially, the USA uses metric". See the ticket for supporting details.
 2014-03-15 09:26:53 +08: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
Nathan Smith cfbc887b2c Changed start of week for Australia to Sunday as requested in https://code.djangoproject.com/ticket/21989 2014-03-14 14:00:27 -04: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 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 5c5b266b54 Simplified implementation of collectstatic command. 
Since d2e242d16c6dde6f4736086fb38057424bed3edb made isinstance()
calls work correctly on LazyObject, we can simplify the
implementation of is_local_storage added in
7e27885c6e.
 2014-03-13 10:03:01 +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 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
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
Ramiro Morales 1d42a86ec7 Tweak password admin change form view context. Refs #21293. 2014-03-11 09:52:43 -03:00