mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00
Code Issues 32 Releases Wiki Activity
18,070 Commits 29 Branches 437 Tags
Commit Graph

2267 Commits

Author SHA1 Message Date
Huu Nguyen
d9a83d597e [1.7.x] Fixed #22862 -- Added --noinput option to makemigrations. 
Thanks artortenburger for the report.

Backport of fbb684d95e from master
 2014-06-20 09:10:43 -04:00
Andrew Godwin
44b00af9bc [1.7.x] Fixed #22874: Document that AUTH_USER_MODEL must be in first migration 2014-06-19 23:48:57 -07:00
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
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
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
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
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
417da8a782 [1.7.x] Doc edits for refs #22487. 
Backport of c17cd151d8 from master
 2014-06-09 12:16:04 -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
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
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
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 5b98ba08e2cc8760525fc1e0a2c917c063b0d5e2 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 fa8b4735287c92b03d23823de8a4e1168d1951d9 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
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
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 9fb0f5dddc4cf7f2d294af1bcde2c359cffd90a5 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
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
Erik Romijn
bc2bfbadcc [1.7.x] Fixed #22644 -- Clarified documentation for NamedUrlWizardView 
Backport of 727d048f0991ccbd1564c6fb225ffbfd2f1a2102 from master.
 2014-05-17 15:11:00 +02: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
Moritz
bd45139d4e [1.7.x] Fixed #22167 -- Improved documentation on context processors 
Backport of e7ffba8f78849fbf60b98fb8d67ef4577b585e3b from master.
 2014-05-16 18:27:55 +02:00
Claude Paroz
e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles 
Backport of e520a73ee from master.
 2014-05-15 20:01:31 +02:00
Anders Steinlein
2914f66983 [1.7.x] Fixed #17642 -- Added min_num support to modelformsets, inlines, and the admin. 
Thanks Stephen Burrows for work on the patch as well.
 2014-05-15 07:02:06 -04:00
Éric Araujo
d1860a3529 [1.7.x] Fixed typo that disabled code example highlighting 
Backport of 5ab95168cc from master
 2014-05-15 05:52:30 -04:00
Tim Graham
50f228ae7c [1.7.x] Removed an unnecessary anchor in the docs. 
Backport of a06808d370 from master
 2014-05-13 20:55:00 -04:00
Tim Graham
0bb90de869 [1.7.x] Fixed #22618 -- Improved import_string example. 
Thanks ewjoachim for the sugggestion.

Backport of c501662f3c from master
 2014-05-13 07:05:35 -04:00
Tim Graham
2455699a91 [1.7.x] Fixed #22613 -- Added formfield_for_choice_field() to the list of methods that InlineModelAdmin supports. 
Backport of 986bd41f8a from master
 2014-05-12 07:01:19 -04:00
Markus Amalthea Magnuson
ff938b3623 [1.7.x] Insert space. 
Backport of 8eb51a8cf6 from master
 2014-05-11 16:18:01 -04:00
Andrew Godwin
7f63ac5a9f [1.7.x] Fixed #22496: Data migrations get transactions again! 2014-05-07 14:29:04 -07:00
Claude Paroz
79e4a189f3 [1.7.x] Updated the messages context processor docs 
Refs #20610.
Backport of 7951f125e frmo master.
 2014-05-06 20:39:13 +02:00
Tim Graham
2a2d7db01f [1.7.x] Fixed #1349 -- Clarified docs on serving files from STATIC/MEDIA_URL. 
Backport of fb7c347f7b from master
 2014-05-05 07:39:03 -04:00
Simon Charette
a6ecd5dbb3 [1.7.x] Fixed #19195 -- Allow explicit ordering by a relation _id field. 
Thanks to chrisedgemon for the report and shaib, akaariai and
timgraham for the review.

Backport of 24ec9538b7 from master
 2014-04-30 14:26:39 -04:00
Mike Fogel
bb5c7e4e8d [1.7.x] Fixed #22537 -- Add tests and improved docs for field subclass with choices. 
Backport of 7fd1b35ed7 from master
 2014-04-30 07:57:35 -04:00