Tim Graham 
							
						 
					 
					
						
						
							
						
						3d88ed3341 
					 
					
						
						
							
							[1.7.x]  Fixed   #23344  -- Removed duplicate docs for file upload settings.  
						
						... 
						
						
						
						Backport of c7fa27d702 
						
						
					 
					
						2014-08-23 09:31:48 -04:00 
						 
				 
			
				
					
						
							
							
								Collin Anderson 
							
						 
					 
					
						
						
							
						
						8f9dd9f256 
					 
					
						
						
							
							[1.7.x] Refs  #23276 : Removed bad examples of passing views as strings to url()  
						
						... 
						
						
						
						partial backport of a9fd740d22 
						
						
					 
					
						2014-08-12 14:44:09 -04:00 
						 
				 
			
				
					
						
							
							
								Mohammed Attia 
							
						 
					 
					
						
						
							
						
						b6a6033096 
					 
					
						
						
							
							[1.7.x] Removed a doc reference to the deprecated mimetype kwarg.  
						
						... 
						
						
						
						Backport of 61ed959235 
						
						
					 
					
						2014-08-06 22:18:29 -04:00 
						 
				 
			
				
					
						
							
							
								areski 
							
						 
					 
					
						
						
							
						
						a582431b41 
					 
					
						
						
							
							[1.7.x]  Fixed   #23169  - Misc docs fixes.  
						
						... 
						
						
						
						Backport of e4dd8b5dde 
						
						
					 
					
						2014-08-04 08:31:18 -04:00 
						 
				 
			
				
					
						
							
							
								Erik Romijn 
							
						 
					 
					
						
						
							
						
						a4eb590958 
					 
					
						
						
							
							[1.7.x]  Fixed   #23149  -- Clarified note on HTTPOnly in cookie-based session docs  
						
						... 
						
						
						
						Backport of e26366da44 
						
						
					 
					
						2014-08-02 18:57:34 +02:00 
						 
				 
			
				
					
						
							
							
								David Hoffman 
							
						 
					 
					
						
						
							
						
						08e8e2137d 
					 
					
						
						
							
							[1.7.x]  Fixed   #23097  -- Switched to new octal format in docs  
						
						... 
						
						
						
						Backport of e1c85167a3 
						
						
					 
					
						2014-07-26 11:21:16 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						8e34bcdfba 
					 
					
						
						
							
							[1.7.x]  Fixed   #23023  -- Added warning against local-memory cache.  
						
						... 
						
						
						
						Thanks django at kerz.id.au.
Backport of 7d0519c725 
						
						
					 
					
						2014-07-16 12:35:01 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						a3d710a38f 
					 
					
						
						
							
							[1.7.x] Revert "Improve cookie based session backend docs." refs  #20418  
						
						... 
						
						
						
						This reverts commit d9c01da1f8#22934 ).
We can add a note like this back after refs #22986  is resolved.
Backport of 3a85aae2ea 
						
						
					 
					
						2014-07-09 14:12:32 -04:00 
						 
				 
			
				
					
						
							
							
								Peter Kowalczyk 
							
						 
					 
					
						
						
							
						
						ea64ef7ed7 
					 
					
						
						
							
							[1.7.x] Fixed typo in middleware docs.  
						
						... 
						
						
						
						Function definition should have an ending colon.
Backport of 48241ec9c4 
						
						
					 
					
						2014-06-24 16:09:04 -04:00 
						 
				 
			
				
					
						
							
							
								Maxime Turcotte 
							
						 
					 
					
						
						
							
						
						de0e285be8 
					 
					
						
						
							
							[1.7.x]  Fixed   #22801  -- Added 'www.' to diveintopython.net links  
						
						... 
						
						
						
						Backport of f97c53c098 
						
						
					 
					
						2014-06-10 15:39:05 -04:00 
						 
				 
			
				
					
						
							
							
								Jonathan Lindén 
							
						 
					 
					
						
						
							
						
						a83c56a45a 
					 
					
						
						
							
							[1.7.x]  Fixed   #21938  -- Moved documentation for error views to reference guide.  
						
						... 
						
						
						
						Backport of 5b98ba08e2 
						
						
					 
					
						2014-06-01 13:07:19 -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 
						
						
					 
					
						2014-05-22 18:34:00 +02:00 
						 
				 
			
				
					
						
							
							
								Anubhav Joshi 
							
						 
					 
					
						
						
							
						
						d9c7d9eb6e 
					 
					
						
						
							
							[1.7.x]  Fixed   #9535  -- Added a reference guide for file upload classes.  
						
						... 
						
						
						
						Backport of c8c2b8a638 
						
						
					 
					
						2014-04-08 10:09:01 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Martin 
							
						 
					 
					
						
						
							
						
						e2e773c04a 
					 
					
						
						
							
							[1.7.x]  Fixed   #21941  -- Documented the kwargs param of django.conf.urls.url().  
						
						... 
						
						
						
						Thanks cjerdonek for the report.
Backport of a779757706 
						
						
					 
					
						2014-03-27 07:02:02 -04:00 
						 
				 
			
				
					
						
							
							
								Rik 
							
						 
					 
					
						
						
							
						
						355572ac56 
					 
					
						
						
							
							Fixed   #12670  -- Added a note about permissions of files stored in FILE_UPLOAD_TEMP_DIR.  
						
						... 
						
						
						
						Thanks simon29 for the suggestion. 
						
						
					 
					
						2014-02-25 11:19:31 -05:00 
						 
				 
			
				
					
						
							
							
								Antoine Catton 
							
						 
					 
					
						
						
							
						
						e3d0790bd0 
					 
					
						
						
							
							Fixed   #21177  -- Made resolve_url support relative URLs.  
						
						... 
						
						
						
						This fixes redirecting to relative URLs with django.shortcuts.redirect. 
						
						
					 
					
						2014-02-14 17:58:03 -05:00 
						 
				 
			
				
					
						
							
							
								Baptiste Mispelon 
							
						 
					 
					
						
						
							
						
						05d36dc06e 
					 
					
						
						
							
							Always use parentheses when documenting a method with no arguments.  
						
						
						
						
					 
					
						2014-01-22 22:26:10 +01:00 
						 
				 
			
				
					
						
							
							
								Baptiste Mispelon 
							
						 
					 
					
						
						
							
						
						79e1d6ebd7 
					 
					
						
						
							
							Don't show self in the list of arguments of a method.  
						
						... 
						
						
						
						This is consistent with Python's official documentation
and it's a sphinx recommendation too[1].
[1] http://sphinx-doc.org/markup/desc.html#dir-method 
Refs #21855 . 
						
						
					 
					
						2014-01-22 22:17:32 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						4d27d311f6 
					 
					
						
						
							
							Fixed a sentence in the session security docs; thanks claudep.  
						
						
						
						
					 
					
						2014-01-03 12:02:58 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						270f7e2167 
					 
					
						
						
							
							Fixed   #21708  -- Added some headings to separate unrelated topics.  
						
						... 
						
						
						
						Thanks ashley at ashleymills.com for the suggestion. 
						
						
					 
					
						2013-12-30 17:55:12 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						025ec2e7fe 
					 
					
						
						
							
							Fixed   #21582  -- Corrected URL namespace example.  
						
						... 
						
						
						
						Thanks oubiga for the report. 
						
						
					 
					
						2013-12-26 20:04:28 -05:00 
						 
				 
			
				
					
						
							
							
								johannes-gehrs 
							
						 
					 
					
						
						
							
						
						f685f94c98 
					 
					
						
						
							
							Fixed   #21580  -- Clarified why render() does not return a TemplateResponse object.  
						
						
						
						
					 
					
						2013-12-13 18:56:18 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						f3e7ab366c 
					 
					
						
						
							
							Removed gender-based pronouns per [ c0a2daad78].  
						
						
						
						
					 
					
						2013-11-30 08:37:15 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						df6760f12c 
					 
					
						
						
							
							Added a warning regarding risks in serving user uploaded media.  
						
						... 
						
						
						
						Thanks Preston Holmes for the draft text. 
						
						
					 
					
						2013-11-27 16:35:25 -05:00 
						 
				 
			
				
					
						
							
							
								Alex Gaynor 
							
						 
					 
					
						
						
							
						
						4e07d93325 
					 
					
						
						
							
							Fixed some unnescesarily gendered language in the docs  
						
						
						
						
					 
					
						2013-11-24 21:05:59 -06:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						f0fc1690b4 
					 
					
						
						
							
							Removed unused import in docs/topics/http/sessions.txt  
						
						
						
						
					 
					
						2013-11-22 15:28:22 -05:00 
						 
				 
			
				
					
						
							
							
								Baptiste Mispelon 
							
						 
					 
					
						
						
							
						
						ebfa508fa3 
					 
					
						
						
							
							Added more examples to the get_object_or_404 documentation.  
						
						
						
						
					 
					
						2013-11-19 19:23:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						9348fc5628 
					 
					
						
						
							
							Fixed typo in topics/http/sessions.txt.  
						
						
						
						
					 
					
						2013-11-18 19:10:58 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						d011714002 
					 
					
						
						
							
							Fixed   #21440  -- Typo  #2  in topics/http/shortcuts.txt  
						
						... 
						
						
						
						Thanks alasdair. 
						
						
					 
					
						2013-11-15 10:21:58 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						6e9e6ca071 
					 
					
						
						
							
							Fixed   #21440  -- Typo in topics/http/shortcuts.txt  
						
						... 
						
						
						
						Thanks olof.bjarnason at gmail.com for the report. 
						
						
					 
					
						2013-11-15 07:09:46 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						a3372f67cb 
					 
					
						
						
							
							Added a warning regarding session security and subdomains.  
						
						
						
						
					 
					
						2013-10-18 09:42:45 -04:00 
						 
				 
			
				
					
						
							
							
								Bouke Haarsma 
							
						 
					 
					
						
						
							
						
						8fc63087f6 
					 
					
						
						
							
							Fixed   #21264  -- Incorrect RST usage in docs  
						
						
						
						
					 
					
						2013-10-14 08:14:27 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						1dae4ac177 
					 
					
						
						
							
							Whitespace cleanup.  
						
						... 
						
						
						
						* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs. 
						
						
					 
					
						2013-10-10 16:49:20 -04:00 
						 
				 
			
				
					
						
							
							
								Baptiste Mispelon 
							
						 
					 
					
						
						
							
						
						e1b7723817 
					 
					
						
						
							
							Changed the doc to use gender-neutral pronouns when possible.  
						
						
						
						
					 
					
						2013-10-02 16:41:04 +02:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						00a0d3de02 
					 
					
						
						
							
							Clarified session replay attack differences with cookie backend.  
						
						
						
						
					 
					
						2013-10-02 10:15:18 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						77f6b468e5 
					 
					
						
						
							
							Fixed   #21137  -- Corrected ULRconf include example.  
						
						... 
						
						
						
						Thanks marfire for the report. 
						
						
					 
					
						2013-09-24 09:41:12 -04:00 
						 
				 
			
				
					
						
							
							
								Ramiro Morales 
							
						 
					 
					
						
						
							
						
						ce0c5c38ea 
					 
					
						
						
							
							A few doc additions for changes from  d228c1192e.  
						
						
						
						
					 
					
						2013-09-22 13:46:16 -03:00 
						 
				 
			
				
					
						
							
							
								Michael DiBernardo 
							
						 
					 
					
						
						
							
						
						222460a994 
					 
					
						
						
							
							Fixed   #21137  -- Documented best practice for URLconfs with repeated pattern prefixes.  
						
						
						
						
					 
					
						2013-09-21 18:17:21 -04:00 
						 
				 
			
				
					
						
							
							
								Markus Amalthea Magnuson 
							
						 
					 
					
						
						
							
						
						2c5c422d34 
					 
					
						
						
							
							Added missing "in" in sentence.  
						
						
						
						
					 
					
						2013-09-19 13:26:01 -04:00 
						 
				 
			
				
					
						
							
							
								Berker Peksag 
							
						 
					 
					
						
						
							
						
						2f0566fa61 
					 
					
						
						
							
							Fixed   #4278  -- Added a dirs parameter to a few functions to override TEMPLATE_DIRS.  
						
						... 
						
						
						
						* django.template.loader.get_template()
* django.template.loader.select_template()
* django.shortcuts.render()
* django.shortcuts.render_to_response()
Thanks amcnabb for the suggestion. 
						
						
					 
					
						2013-09-18 07:37:08 -04:00 
						 
				 
			
				
					
						
							
							
								CHI Cheng 
							
						 
					 
					
						
						
							
						
						ed9cd4fd8b 
					 
					
						
						
							
							Fixed   #21000  -- Made cached_db session backend respect SESSION_CACHE_ALIAS  
						
						
						
						
					 
					
						2013-09-05 10:47:58 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						3baf1d1042 
					 
					
						
						
							
							Fixed   #21002  -- Documented JSON session serialization requires string keys  
						
						... 
						
						
						
						Thanks jeroen.pulles at redslider.net for the report. 
						
						
					 
					
						2013-09-03 07:48:03 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						be48c6c199 
					 
					
						
						
							
							Fixed   #20997  -- Added SessionStore note to docs.  
						
						... 
						
						
						
						Thanks jsdalton. 
						
						
					 
					
						2013-08-29 14:15:58 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Godwin 
							
						 
					 
					
						
						
							
						
						5569b0b92f 
					 
					
						
						
							
							Merge remote-tracking branch 'core/master' into schema-alteration  
						
						... 
						
						
						
						Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/models/signals.py
	tests/queries/tests.py 
						
						
					 
					
						2013-08-23 12:36:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Graham 
							
						 
					 
					
						
						
							
						
						b0ce6fe656 
					 
					
						
						
							
							Fixed   #20922  -- Allowed customizing the serializer used by contrib.sessions  
						
						... 
						
						
						
						Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.
Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews. 
						
						
					 
					
						2013-08-22 13:58:26 -04:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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