Andrew Godwin 
							
						 
					 
					
						
						
							
						
						b6a957f0ba 
					 
					
						
						
							
							Merge remote-tracking branch 'core/master' into schema-alteration  
						
						... 
						
						
						
						Conflicts:
	docs/ref/django-admin.txt 
						
						
					 
					
						2013-08-19 18:30:48 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						7b69c3e775 
					 
					
						
						
							
							Removed versionadded/changed annotations for 1.5  
						
						
						
						
					 
					
						2013-08-19 09:09:41 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						29255fcb4f 
					 
					
						
						
							
							Fixed some ReST errors regarding backticks  
						
						
						
						
					 
					
						2013-08-15 07:14:10 -04:00 
						 
				 
			
				
					
						
							
							
								Mel Collins 
							
						 
					 
					
						
						
							
						
						6bdb3b1135 
					 
					
						
						
							
							Fixed   #13518  -- Added FILE_UPLOAD_DIRECTORY_PERMISSIONS setting  
						
						... 
						
						
						
						This setting does for new directories what FILE_UPLOAD_PERMISSIONS
does for new files.
Thanks jacob@ for the suggestion. 
						
						
					 
					
						2013-08-12 07:15:59 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						ab680725bf 
					 
					
						
						
							
							Fixed   #20890  -- Added missing import in class-based view docs.  
						
						... 
						
						
						
						Thanks André Augusto. 
						
						
					 
					
						2013-08-10 18:08:05 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						7970d97a70 
					 
					
						
						
							
							Docs tweaks (thanks timgraham)  
						
						
						
						
					 
					
						2013-08-10 20:00:12 +01:00 
						 
				 
			
				
					
						
							
							
								ersran9 
							
						 
					 
					
						
						
							
						
						00d23a13eb 
					 
					
						
						
							
							Fixed   #20828  -- Allowed @permission_required to take a list of permissions  
						
						... 
						
						
						
						Thanks Giggaflop for the suggestion. 
						
						
					 
					
						2013-08-10 10:10:18 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						de64c4d6e9 
					 
					
						
						
							
							Merge remote-tracking branch 'core/master' into schema-alteration  
						
						... 
						
						
						
						Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt 
						
						
					 
					
						2013-08-09 14:17:30 +01:00 
						 
				 
			
				
					
						
							
							
								Leandro Regueiro 
							
						 
					 
					
						
						
							
						
						709cd2c4b7 
					 
					
						
						
							
							Added section labels in cache docs  
						
						
						
						
					 
					
						2013-08-06 11:56:01 -04:00 
						 
				 
			
				
					
						
							
							
								Dominic Rodger 
							
						 
					 
					
						
						
							
						
						c33d1ca1d9 
					 
					
						
						
							
							Fixed   #20852  - Fixed incorrectly generated left quotes in docs.  
						
						... 
						
						
						
						Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.
Instances of the problem were found by looking for
">‘" in the generated HTML. 
						
						
					 
					
						2013-08-06 07:13:17 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Michalicek 
							
						 
					 
					
						
						
							
						
						6d88d47be6 
					 
					
						
						
							
							Fixed   #20832  -- Enabled HTML password reset email  
						
						... 
						
						
						
						Added optional html_email_template_name parameter to password_reset view
and PasswordResetForm. 
						
						
					 
					
						2013-08-05 09:47:28 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						26c4bd38ac 
					 
					
						
						
							
							Fixed   #20862  -- Updated startproject MIDDLEWARE_CLASSES in docs.  
						
						... 
						
						
						
						Thanks Keryn Knight. 
						
						
					 
					
						2013-08-05 08:14:27 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Michalicek 
							
						 
					 
					
						
						
							
						
						61ecb5f48a 
					 
					
						
						
							
							Fixed   #20855  -- Added documentation of current_app and extra_context params to django.contrib.auth views  
						
						... 
						
						
						
						refs #5298  and refs #8342  
						
						
					 
					
						2013-08-04 08:04:12 -04:00 
						 
				 
			
				
					
						
							
							
								Alasdair Nicol 
							
						 
					 
					
						
						
							
						
						a0c58113b9 
					 
					
						
						
							
							Added missing request argument to example in URL dispatcher docs  
						
						
						
						
					 
					
						2013-08-03 20:42:02 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						31ee120787 
					 
					
						
						
							
							Fixed   #20667  - Removed discussion of DEBUG from tutorial.  
						
						... 
						
						
						
						Forward-port of 3493f18d78 
						
						
					 
					
						2013-08-01 18:07:59 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						a1889397a9 
					 
					
						
						
							
							Fixed   #12103  -- Added AuthenticationForm.confirm_login_allowed to allow customizing the logic policy.  
						
						... 
						
						
						
						Thanks ejucovy and lasko for work on the patch. 
						
						
					 
					
						2013-07-31 13:54:05 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						d4dd55e78c 
					 
					
						
						
							
							Doc tweaks for html_message parameter to send_mail(); refs  #20817  
						
						
						
						
					 
					
						2013-07-30 08:06:49 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						fddc5957c5 
					 
					
						
						
							
							Implement allow_migrate for migration operations  
						
						
						
						
					 
					
						2013-07-30 12:34:31 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						12e9804d16 
					 
					
						
						
							
							Rename allow_syncdb to allow_migrate  
						
						
						
						
					 
					
						2013-07-30 12:08:59 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						68e0a169c4 
					 
					
						
						
							
							Rename pre_ and post_syncdb to *_migrate, with aliases from old names  
						
						
						
						
					 
					
						2013-07-30 11:52:52 +01:00 
						 
				 
			
				
					
						
							
							
								Justin Michalicek 
							
						 
					 
					
						
						
							
						
						ac09558760 
					 
					
						
						
							
							Fixed   #20817  -- Added html_message parameter to django.core.mail.send_mail()  
						
						
						
						
					 
					
						2013-07-29 09:53:47 -04:00 
						 
				 
			
				
					
						
							
							
								minusf 
							
						 
					 
					
						
						
							
						
						70c080fcdb 
					 
					
						
						
							
							Misc doc cleanups.  
						
						
						
						
					 
					
						2013-07-29 06:57:33 -04:00 
						 
				 
			
				
					
						
							
							
								Jannis Leidel 
							
						 
					 
					
						
						
							
						
						33e6cf5ec3 
					 
					
						
						
							
							Fixed   #20774  -- Mention the new django-localflavor app as a replacement for the contrib app.  
						
						
						
						
					 
					
						2013-07-29 10:54:53 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						0b35a2cce3 
					 
					
						
						
							
							Fixed ReST typo in topics/class-based-views/mixins.txt  
						
						
						
						
					 
					
						2013-07-28 14:09:29 -04:00 
						 
				 
			
				
					
						
							
							
								Julien Phalip 
							
						 
					 
					
						
						
							
						
						47c755327b 
					 
					
						
						
							
							Fixed a number of minor misspellings.  
						
						
						
						
					 
					
						2013-07-27 18:46:03 -07:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						88e1e6f9f3 
					 
					
						
						
							
							A bit more documentation  
						
						
						
						
					 
					
						2013-07-26 16:28:09 +01:00 
						 
				 
			
				
					
						
							
							
								Loic Bistuer 
							
						 
					 
					
						
						
							
						
						31fadc1202 
					 
					
						
						
							
							Fixed   #20625  -- Chainable Manager/QuerySet methods.  
						
						... 
						
						
						
						Additionally this patch solves the orthogonal problem that specialized
`QuerySet` like `ValuesQuerySet` didn't inherit from the current `QuerySet`
type. This wasn't an issue until now because we didn't officially support
custom `QuerySet` but it became necessary with the introduction of this new
feature.
Thanks aaugustin, akaariai, carljm, charettes, mjtamlyn, shaib and timgraham
for the reviews. 
						
						
					 
					
						2013-07-26 12:41:27 +03:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						f8297f6323 
					 
					
						
						
							
							More migration docs, and conversion of all easy syncdb references  
						
						
						
						
					 
					
						2013-07-25 16:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						06103c8ef5 
					 
					
						
						
							
							Small start to migrations documentation  
						
						
						
						
					 
					
						2013-07-25 14:45:38 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						bd0dcc6c89 
					 
					
						
						
							
							Fixed   #20766  -- Deprecated FastCGI support.  
						
						
						
						
					 
					
						2013-07-24 13:41:45 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						65e03a424e 
					 
					
						
						
							
							Fixed   #10284  -- ModelFormSet.save(commit=False) no longer deletes objects  
						
						... 
						
						
						
						Thanks laureline.guerin@ and Wedg. 
						
						
					 
					
						2013-07-23 16:21:23 -04:00 
						 
				 
			
				
					
						
							
							
								Claude Paroz 
							
						 
					 
					
						
						
							
						
						6d52844b9b 
					 
					
						
						
							
							Fixed   #18551  -- Enabled skipIfDBFeature/skipUnlessDBFeature to decorate a class  
						
						... 
						
						
						
						Thanks Tim Graham for the review and improved patch. 
						
						
					 
					
						2013-07-19 20:30:14 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						e1c737b62f 
					 
					
						
						
							
							Merge pull request  #1374  from seocam/fix_i18n_docs  
						
						... 
						
						
						
						LocaleMiddleware isn't default anymore (corrected docs) 
						
						
					 
					
						2013-07-19 03:35:46 -07:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						997e305d24 
					 
					
						
						
							
							Merge pull request  #1375  from Matt-Stevens/master  
						
						... 
						
						
						
						Fixed Croatia's country code in `localflavor` docs 
						
						
					 
					
						2013-07-19 02:30:27 -07:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						4669986228 
					 
					
						
						
							
							Merge pull request  #1378  from loic/docs  
						
						... 
						
						
						
						Fixed  #20772  -- Fixed minor typo in form media docs. 
					
						2013-07-19 02:19:24 -07:00 
						 
				 
			
				
					
						
							
							
								Loic Bistuer 
							
						 
					 
					
						
						
							
						
						aa41eb9b8b 
					 
					
						
						
							
							Fixed   #20772  -- Fixed minor typo in form media docs.  
						
						
						
						
					 
					
						2013-07-19 15:48:38 +07:00 
						 
				 
			
				
					
						
							
							
								Matt Deacalion Stevens 
							
						 
					 
					
						
						
							
						
						97e5398629 
					 
					
						
						
							
							Fix Croatia's country code in localflavor docs  
						
						... 
						
						
						
						Croatia's country code is 'HR', not 'CR'. 
						
						
					 
					
						2013-07-19 09:01:13 +01:00 
						 
				 
			
				
					
						
							
							
								Sergio Oliveira 
							
						 
					 
					
						
						
							
						
						cf6c754629 
					 
					
						
						
							
							LocaleMiddleware isn't default anymore  
						
						... 
						
						
						
						Changed in @23229061fcb836ecca2195cc75f91e331279a5d1 
						
						
					 
					
						2013-07-18 21:15:30 -03:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						dce8945ea6 
					 
					
						
						
							
							Fixed   #20762  -- Clarified that add_fieldsets is not a standard ModelAdmin attribute.  
						
						
						
						
					 
					
						2013-07-18 12:41:01 -04:00 
						 
				 
			
				
					
						
							
							
								Loic Bistuer 
							
						 
					 
					
						
						
							
						
						fba6c2ede7 
					 
					
						
						
							
							Reworked docs for ModelForm validation.  
						
						
						
						
					 
					
						2013-07-16 19:20:53 -04:00 
						 
				 
			
				
					
						
							
							
								David Binetti 
							
						 
					 
					
						
						
							
						
						51b50c47c7 
					 
					
						
						
							
							Fixes grammatical error in auth docs  
						
						... 
						
						
						
						Changes "An error will be raise if you try..." to "An error will be raised if you try..." 
						
						
					 
					
						2013-07-13 20:28:04 -07:00 
						 
				 
			
				
					
						
							
							
								Claude Paroz 
							
						 
					 
					
						
						
							
						
						64099e30e8 
					 
					
						
						
							
							Removed obsolete sentence in queries docs  
						
						
						
						
					 
					
						2013-07-13 21:08:44 +02:00 
						 
				 
			
				
					
						
							
							
								Joeri Bekker 
							
						 
					 
					
						
						
							
						
						66f3d57b79 
					 
					
						
						
							
							Fixed   #19031  -- Added a warning when using override_settings with 'DATABASES'  
						
						
						
						
					 
					
						2013-07-12 07:10:18 -04:00 
						 
				 
			
				
					
						
							
							
								Claude Paroz 
							
						 
					 
					
						
						
							
						
						59ebe39812 
					 
					
						
						
							
							Fixed   #17471  -- Added smtplib.SMTP_SSL connection option for SMTP backend  
						
						... 
						
						
						
						Thanks dj.facebook at gmail.com for the report and initial patch
and Areski Belaid and senko for improvements. 
						
						
					 
					
						2013-07-11 22:00:08 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						684a606a4e 
					 
					
						
						
							
							Fixed   #20730  -- Fixed "Programmatically creating permissions" error.  
						
						... 
						
						
						
						Thanks glarrain for the report. 
						
						
					 
					
						2013-07-11 11:06:34 -04:00 
						 
				 
			
				
					
						
							
							
								Benjamin Kagia 
							
						 
					 
					
						
						
							
						
						b0953dc913 
					 
					
						
						
							
							Fixed   #13721  -- Added UploadedFile.content_type_extra.  
						
						... 
						
						
						
						Thanks Waldemar Kornewald and mvschaik for work on the patch. 
						
						
					 
					
						2013-07-11 09:11:59 -04:00 
						 
				 
			
				
					
						
							
							
								SusanTan 
							
						 
					 
					
						
						
							
						
						ef3fddf26e 
					 
					
						
						
							
							Fixed   #18261  -- Clarified 'project root directory'  
						
						
						
						
					 
					
						2013-07-09 07:11:41 -04:00 
						 
				 
			
				
					
						
							
							
								James Bennett 
							
						 
					 
					
						
						
							
						
						c0f03175ce 
					 
					
						
						
							
							Fixed   #19695  -- Retitle "Form Media" to "Form Assets".  
						
						
						
						
					 
					
						2013-07-08 13:59:54 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						660c30ed95 
					 
					
						
						
							
							Fixed   #16965  -- Clarified Formset can_delete docs.  
						
						... 
						
						
						
						Thanks gregcorey@ for the suggestion. 
						
						
					 
					
						2013-07-08 12:08:30 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						181f63c22d 
					 
					
						
						
							
							Fixed   #12346  -- Added a note on how to validate InlineFormSets.  
						
						... 
						
						
						
						Thanks johnsmith for the suggestion. 
						
						
					 
					
						2013-07-08 08:29:28 -04:00