mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
18,239 Commits 30 Branches 460 Tags
00c2a721e20f6487571ed14b69aed620f474104c
Commit Graph

18239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moayad Mardini
4d4ea65418 [1.7.x] Fixed #22692 -- Added docs for makemigrations two command options. 
Added documentation about `--dry-run` and `--merge`.

Backport of e98d303562 from master
 2014-05-25 19:37:11 -04:00
Matthew Schinckel
22d33d52cb [1.7.x] Fixed typo in docs/ref/models/custom-lookups.txt. 
Backport of 2b432d4634 from master
 2014-05-25 19:03:28 -04:00
Florian Apolloner
47d345fe6d [1.7.x] Restored Python 2 compatibility. 
Backport of ee51ab9d23 from master.
 2014-05-26 00:07:57 +02:00
Florian Apolloner
099625d760 [1.7.x] Removed executeable bit from a few files. 
Backport of 9d1bf8f841 from master.
 2014-05-25 23:17:18 +02:00
Florian Apolloner
1992d55eb3 [1.7.x] Fixed a few warnings in the testsuite. 
Backport of 536ebaa048 from master.
 2014-05-25 23:15:31 +02:00
Claude Paroz
0c685ab64f [1.7.x] Removed code deprecated from Django 1.2 
Backport of 2779c299c8 from master.
 2014-05-25 21:26:44 +02:00
Claude Paroz
dbdbda87fc [1.7.x] Fixed #22688 -- Documented ready() may be called more than once 
Backport of b8fc167b32 from master.
 2014-05-24 15:59:28 +02:00
Moayad Mardini
a59870e217 [1.7.x] Fixed #22676 -- makemigrations --dry-run should not ask for defaults 
Made the fix in InteractiveMigrationQuestioner class code, rather than
MigrationAutodetector, because --dry-run shouldn't affect whether
MigrationAutodetector will detect non-nullable fields, but the
questioner should skip the question and returns a None for default
(since that won't be used anyway) if --dry-run is used.

Backport of ee14961a2a from master
 2014-05-24 09:56:43 -04:00
Marc Tamlyn
be733bf672 [1.7.x] Fixed #22510 -- Harden field removal to only None. 
Refs #8620.

If we allow any value to remove form fields then we get name clashes
with method names, media classes etc. There was a backwards
incompatibility introduced meaning ModelForm subclasses with declared
fields called media or clean would lose those fields.

Field removal is now only permitted by using the sentinel value None.
The docs have been slightly reworded to refer to removal of fields
rather than shadowing.

Thanks to gcbirzan for the report and initial patch, and several of the
core team for opinions.

Backport of 9fb0f5dddc from master
 2014-05-24 13:11:50 +01:00
Claude Paroz
cdfefbec72 [1.7.x] Applied unicode_literals to makemessages command 
This also fixes #22686 as some sort of side-effect.
Backport of dbb48d2bb9 from master.
 2014-05-24 13:12:56 +02:00
Claude Paroz
e692c5818b [1.7.x] Removed translatability of PIL error messages 
Note these are no longer in master anyway.
 2014-05-24 12:19:49 +02:00
Claude Paroz
8dad90911a [1.7.x] Made runtests.py use 'set_installed_apps' API 
This will also trigger the ready method of any tested application,
which was not run before.
Backport of 19b4908206 from master.
 2014-05-24 11:03:45 +02:00
Baptiste Mispelon
8f87b679ed [1.7.x] Fixed tuple serialization test. 
Thanks to rockallite for the report.

Backport of f01d2a8f9b from master.
 2014-05-23 14:51:22 +02:00
Huu Nguyen
8462883f9b [1.7.x] Fixed #22602 -- Improved code coverage of makemigrations command tests. 
Backport of f851a954ac from master
 2014-05-23 08:07:58 -04:00
Claude Paroz
1f6b3cf145 [1.7.x] Fixed #20816 -- Added hints about Django middleware ordering 
Thanks gthb Trac user for the report, kolypto StackOverflow
user for the initial list and Tim Graham for the review.
Backport of 756c390fb5 from master.
 2014-05-22 18:34:00 +02:00
Moayad Mardini
7d4a51e239 [1.7.x] Fixed #22679 -- Fixed empty tuple serialization in MigrationWriter. 
Thanks rockallite.wulf for the report.

Backport of ad994a3c5b from master.
 2014-05-22 16:20:21 +02:00
Ramiro Morales
fb45e666c2 [1.7.x] Fixed #22421 -- Regression in fixtures loading. 
Loading fixtures were failing since the refactoring in 244e2b71f5 for
inheritance setups where the chain contains abstract models and the
root ancestor contains a M2M relation.

Thanks Stanislas Guerra for the report.

Refs #20946.

Backport of 862e1ff234 from master
 2014-05-22 07:38:39 -04:00
Claude Paroz
485163f72c [1.7.x] Used link label in models FAQ to ease translation 
Backport of d9d924250 from master.
 2014-05-22 09:48:04 +02:00
Niclas Åhdén
aa9a146a69 [1.7.x] Fixed #22639 -- Added missing imports in docs 
Added ModelForm and NON_FIELD_ERRORS imports.

Backport of 64ee097b3b from master
 2014-05-21 11:20:38 -04:00
Tim Graham
f25c5de4ce [1.7.x] Skipped a migrations test that's not supported on MySQL + Python 3. 
Backport of dfeef8e147 from master
 2014-05-21 07:04:46 -04:00
Andrew Godwin
fd62bc165c [1.7.x] Fixed #22432: SQLite M2M repointing now works. Thanks to xelnor. 
Backport of 03900a02d5 from master
 2014-05-21 07:04:46 -04:00
Andrew Godwin
d8c532036a [1.7.x] Fixed #22649: Beefed up quote_value 
Backport of 125b3d4407 from master
 2014-05-21 07:04:46 -04:00
Loic Bistuer
c60240e712 [1.7.x] Failing testcases for #22649. 
Backport of 5789ff7330 from master
 2014-05-21 07:04:46 -04:00
Loic Bistuer
d61b6224b0 [1.7.x] Fixed #22424 -- Fixed handling of default values for TextField/BinaryField on MySQL. 
Thanks syphar for the review and suggestions.

Backport of 1d3d01b4f7 from master
 2014-05-21 07:04:38 -04:00
Raphaël Barrois
1a29675d76 [1.7.x] Fixed #22626 -- Allow BinaryField defaults with SQlite. 
Also fixes a slight issue in sqlite3.schema._remake_table where
default values where quoted with "column name" quoting rules.

Reference for quoting: http://www.sqlite.org/lang_expr.html

Thanks Shai Berger for the review. Refs #22424.

Backport of 6aacb4c991 from master
 2014-05-21 06:57:49 -04:00
Huu Nguyen
f7270dcd9d [1.7.x] Fixed #22661 -- Move makemigrations tests to the proper class 
Backport of 44304cf04e from master
 2014-05-21 06:56:23 -04:00
Loic Bistuer
0fa1aeb8d8 [1.7.x] Fixed the ordering of prefetch lookups so that latter lookups can refer to former lookups. 
Thanks Anssi Kääriäinen and Tim Graham for the reviews. Refs #17001 and #22650.

Backport of 870b0a1f86 from master
 2014-05-21 10:37:41 +07:00
Loic Bistuer
24a41ecc35 [1.7.x] Fixed #22650 -- Fixed regression on prefetch_related. 
Regression from f51c1f59 when using select_related then prefetch_related
on the reverse side of an O2O:

Author.objects.select_related('bio').prefetch_related('bio__books')

Thanks Aymeric Augustin for the report and tests. Refs #17001.

Backport of bdf3473e64 from master
 2014-05-21 10:37:00 +07:00
Denis Cornehl
0007a43198 [1.7.X] Fixed #22557 -- ManifestStaticFilesStorage did not cleanup deleted files. 
When using ManifestStaticFilesStorage, deleted static files would be
correctly cleaned up by "collectstatic --clear", but the manifest file
would still contain the stale entries.

Thanks to tedtieken for the report

Backport of 3bec38888f from master.
 2014-05-20 18:19:40 +02:00
Claude Paroz
3e2bb807b1 [1.7.x] Removed unused translations in auth tests 
Backport of b8c480a12b from master.
 2014-05-20 12:23:17 +02:00
Marc Tamlyn
157575c7c8 [1.7.x] Fix a2dd618 for mysql. 
Backport of 3b76502 from master
 2014-05-19 15:05:23 +01:00
Marc Tamlyn
c38925a601 [1.7.x] Fixed #22648 -- Transform.output_type should respect overridden custom_lookup and custom_transform. 
Previously, class lookups from the output_type would be used, but any
changes to custom_lookup or custom_transform would be ignored.

Backport of a2dd618 from master
 2014-05-19 15:05:23 +01:00
Moayad Mardini
269291019e [1.7.x] Fixed #22655 -- Fixed GeoQuerySet doc about strictly_below 
The paragraph was a copy of strictly_above.

Backport of 2f43229c2f from master
 2014-05-19 09:50:46 -04:00
Claude Paroz
0f84037e10 [1.7.x] Updated translation catalogs 2014-05-19 15:14:09 +02:00
Claude Paroz
16c433967a [1.7.x] Re-added JS catalog in manage_translations script 
Backport of d20aa78cbf from master.
 2014-05-19 15:12:08 +02:00
Tim Graham
1e78d132da [1.7.x] Fixed #22652 -- Replaced UserModel.objects with UserModel._default_manager. 
Thanks alexdlaird for the report.

Backport of b68fac7e88 from master
 2014-05-19 08:37:00 -04:00
Claude Paroz
a69534ddd4 [1.7.x] Removed locale dirs for single-message apps 
Considering that these apps only translate their app name, it's not
worth having a whole bunch of po files just for that. The translatable
app name for those apps will be integrated in Django core catalog.
Backport of a1f0c4c697 from master.
 2014-05-19 14:21:01 +02:00
Moayad Mardini
4dd37a3a6e [1.7.x] Fixed #22368 -- clarified connecting to Oracle DB using service name 
Used the official terminology listed in
http://docs.oracle.com/cd/B19306_01/network.102/b14212/glossary.htm#i997309

Thanks michael.cherkasov for the report.

Backport of bfac6bef83 from master
 2014-05-19 07:46:27 -04:00
Claude Paroz
db2aacff99 [1.7.x] Updated Django makemessages process 
makemessages should now automatically distribute translatable
strings in the proper locale files, for Django too
(see 50a8ab7cd1).
Backport of 7999ed9b69 from master.
 2014-05-19 09:30:59 +02:00
SaeX
ed98757e4b [1.7.x] Added "/" divider for DATE(TIME)_INPUT_FORMATS for Dutch locale. 
Dutch ('nl-NL' and 'nl-BE') has several valid input formats;
see http://nl.wikipedia.org/wiki/Datum_(dagtekening).

Thanks Erik Romijn for review.

Backport of e3a9714ce3 from master
 2014-05-18 13:00:32 -04:00
Alex Gaynor
8b87473008 [1.7.x] Fixed several flake8 errors, including one where a test wouldn't be run 
Backport of b6b873d2ad from master
 2014-05-17 13:31:09 -04:00
Erik Romijn
bc2bfbadcc [1.7.x] Fixed #22644 -- Clarified documentation for NamedUrlWizardView 
Backport of 727d048f09 from master.
 2014-05-17 15:11:00 +02:00
Tim Graham
0594d2d714 [1.7.x] Added stub release notes for 1.6.6. 
Backport of 79e9da3d1e from master
 2014-05-16 18:20:45 -04:00
Shai Berger
b7a67b788c [1.7.x] Fixed storing of binary fields and unicode textfields for Oracle/Python3 
Backport of 6bb6df2943 from master
 2014-05-17 01:16:06 +03:00
Claude Paroz
8c5fbcf50a [1.7.x] Fixed case in form widgets docs 
Backport of 9494f29d from master
 2014-05-16 17:44:20 -04:00
Aymeric Augustin
62de03ee33 [1.7.x] Optimized make_aware/naive by removing redundant checks. Refs #22625. 
Also added tests with pytz and removed misplaced tests.

Backport of 1109ebd from master
 2014-05-16 23:14:13 +02:00
Aymeric Augustin
6f8301d6cd [1.7.x] Fixed #22625 -- Normalized make_aware/naive errors. 
Also added tests for is/make_aware/naive.

Thanks Tom Michaelis for the report.

Backport of fa89acf from master
 2014-05-16 22:54:21 +02:00
Stas Rudakou
75d2da797e [1.7.x] Fixed #22266 - quote PK before redirecting away from add_view (django.contrib.admin) 
Backport of ebd70d4d00 from master.
 2014-05-16 18:38:26 +02:00
Moritz
bd45139d4e [1.7.x] Fixed #22167 -- Improved documentation on context processors 
Backport of e7ffba8f78 from master.
 2014-05-16 18:27:55 +02:00
Niclas Åhdén
0504d19db0 [1.7.x] Fixed #22622 -- Added ugettext_lazy import in docs 
Backport of 7271f5db78 from master
 2014-05-16 11:20:58 -04:00