mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-19 22:00:45 +00:00
Code Issues 32 Releases Wiki Activity
17,930 Commits 29 Branches 438 Tags
Commit Graph

17930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
342b25449d [1.7.x] Added a flag for the ability to introspect nullable fields. 
Previously this was conflated with another Oracle-specific behavior.

Backport of a03d38d from master.
 2014-06-05 17:57:48 +02:00
Aymeric Augustin
2e4bcb9b02 Avoided using BinaryField unecessarily in tests. 
Several database backends struggle with binary data. This change
minimizes the risk of unrelated tests failures when binary fields
trigger errors.
 2014-06-05 17:10:42 +02:00
Aymeric Augustin
4fb50a9a82 Reordered setUp code in prefetch_related tests. 
This allows these tests to run on databases that reject duplicate NULL
values in unique fields e.g. SQL Server.
 2014-06-05 16:30:43 +02:00
Guillaume Pannatier
52b7e772e4 [1.7.x] Fixed #22710 -- Amended aggregation note for empty QuerySets 
Thanks smeaton for report and Joël Rochat for spell check

Backport of 7f27cca5c5 from master
 2014-06-04 12:45:24 -04:00
Tim Graham
868b5e5e95 [1.7.x] Fixed #22747 -- Add backwards compatibility tip for new behavior of formset.save(commit=False). 
Thanks django at patjack.co.uk.

Backport of 2f7a7842ba from master
 2014-06-04 12:42:23 -04:00
Alexandr Shurigin
8d6e0d4588 [1.7.x] Fixed #22681 -- Made TarArchive recognize leading directories properly. 
Backport of 083d285b82 from master
 2014-06-03 15:03:32 -04:00
INADA Naoki
c8382f4c65 [1.7.x] Updated current state of MySQL Connector/Python. 
Backport of 7be646425f from master
 2014-06-03 08:10:44 -04:00
Egor Semiguzov
206cb74cef [1.7.x] Removed erroneous trailing comma in OLMapWidget.js. 
Backport of c5226eb72a from master
 2014-06-03 07:44:39 -04:00
Bryce Nesbitt
cb3266c1b0 [1.7.x] Fixed #22753 -- Documented ability to use a note with the {% comment %} tag. 
Backport of e020894470 from master
 2014-06-02 18:52:55 -04:00
Tim Graham
170255caf4 [1.7.x] Fixed #22748 -- Corrected post_migrate usage example. 
Thanks Rudolph for the report.

Backport of a00efa30d6 from master
 2014-06-02 11:39:23 -04:00
Craig de Stigter
724e600872 [1.7.x] Fixed #22690 -- Added a check for proxy models containing fields. 
Removed the FieldError raised by ModelBase.__new__ in this case.

Backport of ce993efda8 from master
 2014-06-02 09:34:31 -04:00
Alex Gaynor
160fd6c7c1 [1.7.x] Removed an unused import 
Backport of a31d7c48b0 from master
 2014-06-02 07:14:02 -04:00
Tim Graham
f8dd382a48 [1.7.x] Revert "Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices" 
This reverts commit 9d1987d7679165ad3a7c2b713a8a488cc1421905.

Backport of 5046c110cf from master
 2014-06-02 07:13:03 -04:00
Claude Paroz
a2fb5c9d69 [1.7.x] Fixed #22744 -- Fixed sqlite3 get_relations introspection with views 
Thanks Tim Graham for the report and Simon Charette for the review.
Backport of 5a504a5311 from master.
 2014-06-01 22:07:22 +02:00
Vincent-Vega
d773a08b27 [1.7.x] Fixed #22711 -- Adjusted ordering checks to allow implicit relation fields. 
refs #19195.

Backport of d04e730224 from master
 2014-06-01 15:37:57 -04:00
Simon Charette
33511662dd [1.7.x] Fixed #22659 -- Prevent model states from sharing field instances. 
Thanks to Trac alias tbartelmess for the report and the test project.

Backport of 7a38f88922 from master
 2014-06-01 15:12:23 -04:00
Fabio Rueda
ad408d0985 [1.7.x] Fixed syntax error in ogrinspect.py management command. 
Backport of f384b638e2 from master
 2014-06-01 13:22:15 -04:00
Jonathan Lindén
a83c56a45a [1.7.x] Fixed #21938 -- Moved documentation for error views to reference guide. 
Backport of 5b98ba08e2cc8760525fc1e0a2c917c063b0d5e2 from master
 2014-06-01 13:07:19 -04:00
Florian Apolloner
ba31e45f08 [1.7.x] Revert "Making SQL management commands migration aware." 
This reverts commit cb9c9a7b5879671053c7d2ad6e79943a8814b274.

Backport of 83e7555ffee305c1ea1e0655fd1f0aa35269533f from master.
 2014-06-01 12:01:29 +02:00
Simon Charette
c95a3fadb7 [1.7.x] Fixed #22299 -- Cleanup wizard temp files when possible. 
Thanks to @erikr for the review.

Backport of fa8b4735287c92b03d23823de8a4e1168d1951d9 from master.
 2014-05-30 22:25:17 +02:00
Florian Apolloner
e3792bb95f [1.7.x] Fixed #19905 -- Fixed leakage of file descriptors in form wizard. 
Backport of c4c2c99669ef9d58306856c47058b121bbecfe5f from master.
 2014-05-30 22:00:25 +02:00
Moayad Mardini
08a2b3b9cf [1.7.x] Improved the test for refs #22682. 
Thanks apollo13 for the review.

Backport of 6f4d7f41b1 from master
 2014-05-30 11:01:42 -04:00
Guillaume Pannatier
b266392b63 [1.7.x] Fixed #22710 -- Documented aggregation behavior for empty QuerySets. 
Thanks matklad for the report.

Backport of 7c6e96ec1f from master
 2014-05-30 08:05:43 -04:00
Andrew Godwin
16d037c4f0 [1.7.x] Fix additional test failures caused by migration pollution 2014-05-29 16:44:29 -07:00
Tim Graham
35bdf87034 [1.7.x] Improved deprecation plan links in release notes. 
Backport of 7ff326928a08d4c51141768bd305a44ca5ecb2e7 from master
 2014-05-29 18:58:55 -04:00
Moayad Mardini
e4eae5df0e [1.7.x] Fixed #22682 -- makemigrations will create MIGRATION_MODULES package 
`makemigrations` will automatically create the package specified
in `MIGRATION_MODULES` if it doesn't already exist.

Thanks ovidiuc4 for the report.
 2014-05-29 15:39:02 -07:00
Andrew Godwin
4956e182ac [1.7.x] Fix test failure caused by 3149cdce32e7261b2d44128ab712c4d4f1a5d429 2014-05-29 15:36:49 -07:00
Víðir Valberg Guðmundsson
b6a960cd1d [1.7.x] Making SQL management commands migration aware. 2014-05-29 15:36:30 -07:00
Tim Graham
c5afdc3d73 [1.7.x] Removed unused import. 2014-05-29 09:28:58 -04:00
Alex Gaynor
d192e02b27 [1.7.x] Fixed a typo that Tim Graham noticed 
Backport of d240b29c08 from master
 2014-05-29 07:53:08 -04:00
Alex Gaynor
3d98941d5c [1.7.x] Fixed several typos in Django 
Backport of 1dcc603eff from master
 2014-05-29 07:53:02 -04:00
Alex Gaynor
d099c03789 [1.7.x] Simplified, very slightly, some code in the oracle backend 
Backport of e79725cdf9 from master
 2014-05-29 07:52:55 -04:00
Víðir Valberg Guðmundsson
ce1dd6a730 [1.7.x] Adding test to fix of duplicate _order fields (#22720) 
Backport of bf9953cfb8 from master
 2014-05-29 07:52:48 -04:00
Víðir Valberg Guðmundsson
0ee27d5b62 [1.7.x] Fixed #22720 -- Migrations attempt to create _order twice. 
Backport of 6cfa2fae39 from master
 2014-05-29 07:52:17 -04:00
Shai Berger
b8b1fbd4c1 [1.7.x] Set straight the sense of 'uppercases_column_names' feature flag 2014-05-28 21:26:08 +03:00
Shai Berger
5f135e6a0b [1.7.x] Fixed #22715: Corrected sql for defaults of BinaryField on Oracle with Python3 
While at it, fixed a problem in returning empty values
(still with BinaryField/Oracle/Python3).

Backport of fd427f1 from master
 2014-05-28 19:02:29 +03:00
Claude Paroz
91ef348bd6 [1.7.x] Fixed #21630 -- Simplified management command discovery 
Thanks Aymeric Augustin for the report end the review.
Backport of fe53bc524 from master.
 2014-05-28 09:35:43 +02:00
Moayad Mardini
5d7ad16a1b [1.7.x] Fixed #22601 -- Added a note about model inheritance. 
Thanks semenov for the report.

Backport of 2ea1e70b85 from master
 2014-05-27 20:11:51 -04:00
Tim Graham
0204893a18 [1.7.x] Added a word to the docs wordlist. 2014-05-27 19:48:50 -04:00
Aymeric Augustin
430faebe3b [1.7.x] Fixed #22699 -- Configure default settings in some management commands. 
This makes it possible to run django.setup() in management commands that
don't need a settings module. In addition it simplifies error handling.

Thanks Claude for the review.

Backport of 4865326f from master.
 2014-05-27 21:46:30 +02:00
Moayad Mardini
c0a56001e0 [1.7.x] Fixed #22675 -- makemigrations --dry-run to output migrations to stdout. 
`makemigrations --dry-run` will output the complete migrations file
that would be written if it's used along with `--verbosity 3`.

Backport of 2e613ea5c5 from master
 2014-05-26 20:03:41 -04:00
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 ee51ab9d232e52d17cd5ad32e230fd715cffe638 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 9d1bf8f841af27c70d1fa5817e88d893ce7c0507 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 536ebaa048f69c18aa36448074f65f2741e35df5 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 9fb0f5dddc4cf7f2d294af1bcde2c359cffd90a5 from master
 2014-05-24 13:11:50 +01:00