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

6653 Commits

Author SHA1 Message Date
Tim Graham 427f218a5e [1.7.x] Fixed #22859 -- Improved crossDomain technique in CSRF example. 
Thanks flisky for the report.

Backport of 0be4d64487 from master
 2014-06-18 14:37:19 -04:00
Jorge C. Leitão 807aadaaad [1.7.x] Fixed #14481 -- Documented implicit "through" class created by ManyToManyField. 
Thanks to jonathanmorgan for the report and initial patch.

Backport of de90129070 from master
 2014-06-18 12:38:49 -04:00
Andrew Godwin f355d253f8 [1.7.x] Fixed #22853: Swapped models are now ignored for migration operations. 2014-06-17 17:46:52 -07:00
Tim Graham aa10f57d94 [1.7.x] Fixed #22819 -- Renamed output_type -> output_field in query expression API. 
Thanks jorgecarleitao for the suggestion.

Backport of 95cc0e15b4 from master
 2014-06-17 12:06:12 -04:00
vagrant 44a50603d4 [1.7.x] Fixed #22842 
Backport of 7a1f8414c3 from master.
 2014-06-16 08:45:58 +02:00
Andrew Godwin e5cde2062c [1.7.x] Fixed #22470: Full migration support for order_with_respect_to 2014-06-15 14:57:00 -07:00
Andrew Godwin a067c61b94 [1.7.x] Fixed #22660: Doc'd you can't have unmigrated apps depend on migrated 2014-06-15 11:47:57 -07:00
Claude Paroz ec2f041736 [1.7.x] Complemented dwithin docs about using geographic geometries 
Refs #22830. Thanks django@gfairchild.com for the suggestion.
Backport of c281831a5c from master.
 2014-06-14 20:54:48 +02:00
mlavin d94de802d3 [1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults. 
Also added a compatibility check for changed middleware defaults.
 2014-06-13 12:40:42 -04:00
Moayad Mardini d3bf537324 [1.7.x] Fixed #22349 -- Added a note clarifying `RawQuerySet` has no `__len__`. 
Thanks cdestigter for the report.

Backport of 2d425116e2 from master
 2014-06-12 16:42:39 -04:00
Tim Graham e51662e7bc [1.7.x] Fixed #22811 -- Allowed setting both the old and new TEST database settings. 
An ImproperlyConfigured exception will be raised they mismatch.

Backport of 1c58cabad7 and a2cd0e12c9 from master
 2014-06-12 13:28:16 -04:00
Tim Graham 910b37e356 [1.7.x] Fixed #22818 -- Clarified you need to cd into the Django clone. 
Thanks Josh Parris.

Backport of bcc3d2b978 from master
 2014-06-12 10:53:29 -04:00
Claude Paroz 1c0e6e9d9f [1.7.x] Fixed #22813 -- Updated Pillow URL in documentation 
Backport of dfa3505ff1 from master.
 2014-06-12 08:56:29 +02:00
Maxime Lorant c6725d69a2 [1.7.x] Fixed typo in docs/ref/forms/validation.txt. 
Backport of c307383ec9 from master
 2014-06-11 17:18:03 -04:00
Greg Chapple 8c20f4af12 [1.7.x] Added link to data migrations in initial data deprecation note 
Backport of 4123f55c33 from master
 2014-06-11 15:43:53 -04:00
Florian Apolloner 1ff11304dc [1.7.x] Fixed #22680 -- I/O operation on closed file. 
This patch is two-fold; first it ensure that Django does close everything in
request.FILES at the end of the request and secondly the storage system should
no longer close any files during save, it's up to the caller to handle that --
or let Django close the files at the end of the request.

Backport of e2efc8965e from master.
 2014-06-11 09:03:11 +02:00
Maxime Turcotte de0e285be8 [1.7.x] Fixed #22801 -- Added 'www.' to diveintopython.net links 
Backport of f97c53c098 from master
 2014-06-10 15:39:05 -04:00
Tim Graham 0767055dfc [1.7.x] Fixed #22770 -- Removed create_superuser from post_migrate signals. 
Moved logic to syncdb command for backwards compatibility.

Backport of 93d05536fd from master
 2014-06-10 15:00:12 -04:00
Tim Graham e108da65fe [1.7.x] Corrected some indentation in docs/topics/auth/default.txt. 
Backport of 34f4fd7024 from master
 2014-06-10 09:19:38 -04:00
Tim Graham 417da8a782 [1.7.x] Doc edits for refs #22487. 
Backport of c17cd151d8 from master
 2014-06-09 12:16:04 -04:00
Tim Graham a11ed8dcfd [1.7.x] Added missing deprecation note for fastcgi in 1.7 release notes; refs #20766. 
Backport of 67ce2e74e1 from master
 2014-06-09 10:32:09 -04:00
Andrew Godwin 08218252d8 [1.7.x] Fixed #22487: Optional rollback emulation for migrated apps 
Conflicts:
	django/db/backends/creation.py
	django/test/runner.py
	docs/ref/settings.txt
	docs/topics/testing/advanced.txt
 2014-06-08 19:33:52 -07:00
Andrew Godwin 98949e3b10 [1.7.x] Fixed #22436: More careful checking on method ref'ce serialization 2014-06-07 17:06:06 -07:00
Tim Graham a517e9ac85 [1.7.x] Removed duplicate "Deprecated in Django A.B" text in docs. 
sphinx 1.2+ adds this text itself.

Backport of 7f4347b176 from master
 2014-06-07 07:25:02 -04:00
Tim Graham c8c1883962 [1.7.x] Added formatting and line wrapping to checks reference doc. 
Backport of 5472bf4df0 from master
 2014-06-06 15:25:58 -04:00
Éric Araujo 4ad299f287 [1.7.x] Fix missing highlighting in some code examples 
Backport of 84cafc2b35 from master
 2014-06-05 15:14:14 -04: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
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
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
Jonathan Lindén a83c56a45a [1.7.x] Fixed #21938 -- Moved documentation for error views to reference guide. 
Backport of 5b98ba08e2 from master
 2014-06-01 13:07:19 -04:00
Simon Charette c95a3fadb7 [1.7.x] Fixed #22299 -- Cleanup wizard temp files when possible. 
Thanks to @erikr for the review.

Backport of fa8b473528 from master.
 2014-05-30 22:25:17 +02: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
Tim Graham 35bdf87034 [1.7.x] Improved deprecation plan links in release notes. 
Backport of 7ff326928a 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
Alex Gaynor 3d98941d5c [1.7.x] Fixed several typos in Django 
Backport of 1dcc603eff from master
 2014-05-29 07:53:02 -04: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
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
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
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 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
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
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
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