Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fd4c639d7
							
						
					 | 
					
						
						
							
							Merge master into develop
						
						
						
						
						
					 | 
					
						2012-02-21 20:57:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							af9e4f69d7
							
						
					 | 
					
						
						
							
							Merging master into develop
						
						
						
						
						
					 | 
					
						2012-02-21 20:12:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							c04cb5145c
							
						
					 | 
					
						
						
							
							merged with trunk
						
						
						
						
						
					 | 
					
						2012-02-14 10:10:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							821844bb11
							
						
					 | 
					
						
						
							
							fixed examples, corrected small bugs in the process
						
						
						
						
						
					 | 
					
						2012-02-14 10:05:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							b33579a7a1
							
						
					 | 
					
						
						
							
							attempt at fixing the examples
						
						
						
						
						
					 | 
					
						2012-02-10 11:05:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							2cdff1b01e
							
						
					 | 
					
						
						
							
							modified examples, somethin' still broken, can't find what
						
						
						
						
						
					 | 
					
						2012-02-07 16:52:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							6963fd3623
							
						
					 | 
					
						
						
							
							some docs for Request/Response/mixins
						
						
						
						
						
					 | 
					
						2012-02-07 16:22:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							cbac9244ac
							
						
					 | 
					
						
						
							
							Use  app for Django 1.2
						
						
						
						
						
					 | 
					
						2012-02-07 11:22:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f49f9b2b5
							
						
					 | 
					
						
						
							
							In examples settings, use staticfiles for 1.2, django.contrib.staticfiles otherwise
						
						
						
						
						
					 | 
					
						2012-02-07 11:01:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f59d90645
							
						
					 | 
					
						
						
							
							merged with trunk's master
						
						
						
						
						
					 | 
					
						2012-02-02 08:39:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							765ec0b76e
							
						
					 | 
					
						
						
							
							Use staticfiles for serving css.  Fixes #116.
						
						
						
						
						
					 | 
					
						2012-01-28 18:54:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marko Tibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb6f62b2af
							
						
					 | 
					
						
						
							
							fixes #146
						
						
						
						
						
						
						
						rest.ep.io now runs tip. 
						
					 | 
					
						2012-01-27 20:45:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sébastien Piquemal
							
						 
					 | 
					
						
						
						
						
							
						
						
							152c385f4d
							
						
					 | 
					
						
						
							
							enhanced request how-to + example
						
						
						
						
						
					 | 
					
						2012-01-25 00:11:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ce864e63b
							
						
					 | 
					
						
						
							
							Cleanup authentication example
						
						
						
						
						
					 | 
					
						2012-01-24 19:27:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf8fe66f44
							
						
					 | 
					
						
						
							
							Fix .delete on object store example.
						
						
						
						
						
					 | 
					
						2012-01-21 10:07:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Craig Blaszczyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							46e4ba258f
							
						
					 | 
					
						
						
							
							#75 remove except statements which are overly broad in the exception they catch
						
						
						
						
						
					 | 
					
						2012-01-04 18:05:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marko Tibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							412727440b
							
						
					 | 
					
						
						
							
							Add an extra explenation on how to use curl on this view.
						
						
						
						
						
					 | 
					
						2012-01-02 14:55:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd449204c1
							
						
					 | 
					
						
						
							
							Fixup for epio
						
						
						
						
						
					 | 
					
						2011-12-30 15:51:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8bfebc837
							
						
					 | 
					
						
						
							
							ep.io fixes
						
						
						
						
						
					 | 
					
						2011-12-30 15:33:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							07349597ab
							
						
					 | 
					
						
						
							
							whitespace fixes
						
						
						
						
						
					 | 
					
						2011-12-29 13:31:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marko Tibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							500b0dcddc
							
						
					 | 
					
						
						
							
							Added epio configuration.
						
						
						
						
						
					 | 
					
						2011-12-24 13:18:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marko Tibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cd7ab1422
							
						
					 | 
					
						
						
							
							typo
						
						
						
						
						
					 | 
					
						2011-12-12 22:20:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marko Tibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							51c53a8a5c
							
						
					 | 
					
						
						
							
							now really drop the yaml file
						
						
						
						
						
					 | 
					
						2011-12-12 09:41:18 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marko Tibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0bf45d82a
							
						
					 | 
					
						
						
							
							drop yaml fixture and replace with json
						
						
						
						
						
					 | 
					
						2011-12-12 08:51:02 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7b7778a79
							
						
					 | 
					
						
						
							
							pull in markos changes, minor tweaks to yaml stuff
						
						
						
						
						
					 | 
					
						2011-07-01 17:44:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5e019b0b3
							
						
					 | 
					
						
						
							
							Pull in David's initial oauth tests
						
						
						
						
						
					 | 
					
						2011-06-28 08:53:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							d417a1a20a
							
						
					 | 
					
						
						
							
							moved from examples/requirements.txt to main requirements.txt
						
						
						
						
						
					 | 
					
						2011-06-26 01:41:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cab127c2a
							
						
					 | 
					
						
						
							
							some restyling and updated requirements.txt for yaml support
						
						
						
						
						
					 | 
					
						2011-06-26 01:38:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Larlet
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe7e3ba3ae
							
						
					 | 
					
						
						
							
							Adding tests for OAuth authentication through django-oauth-plus, a dedicated example project is still missing though
						
						
						
						
						
					 | 
					
						2011-06-25 18:42:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							bae21b14c9
							
						
					 | 
					
						
						
							
							added a container view for the permissions example
						
						
						
						
						
					 | 
					
						2011-06-25 16:38:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddd36206bc
							
						
					 | 
					
						
						
							
							Added a fixture so that the users default have a user to login with and play with permissions.
						
						
						
						
						
					 | 
					
						2011-06-25 13:08:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							1692942ec2
							
						
					 | 
					
						
						
							
							added a permissions example with just a per-user-throttle which we may want to expand with some auth examples.
						
						
						
						
						
					 | 
					
						2011-06-20 01:11:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef8c286f86
							
						
					 | 
					
						
						
							
							added a permissions example with just a per-user-throttle which we may want to expand with some auth examples.
						
						
						
						
						
					 | 
					
						2011-06-20 01:11:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							37db771cb9
							
						
					 | 
					
						
						
							
							added a permissions example with just a per-user-throttle which we may want to expand with some auth examples.
						
						
						
						
						
					 | 
					
						2011-06-20 01:10:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff6e78323f
							
						
					 | 
					
						
						
							
							update some examples
						
						
						
						
						
					 | 
					
						2011-06-15 14:09:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dcb851c7f
							
						
					 | 
					
						
						
							
							Allow related models to be fully serialized
						
						
						
						
						
					 | 
					
						2011-06-15 14:09:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							412b5fc2d5
							
						
					 | 
					
						
						
							
							Support for nesting resources etc...
						
						
						
						
						
						
						
						--HG--
rename : djangorestframework/tests/resources.py => djangorestframework/tests/serializer.py 
						
					 | 
					
						2011-06-14 18:22:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								markotibold
							
						 
					 | 
					
						
						
						
						
							
						
						
							dac7eb0916
							
						
					 | 
					
						
						
							
							fixed the blogpost-tests
						
						
						
						
						
					 | 
					
						2011-06-09 01:47:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7c1408875
							
						
					 | 
					
						
						
							
							Fix example tests
						
						
						
						
						
					 | 
					
						2011-06-08 01:03:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6d807c844
							
						
					 | 
					
						
						
							
							Ug. Remove crazy tests from blogposts example
						
						
						
						
						
					 | 
					
						2011-06-07 23:51:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8980892c4
							
						
					 | 
					
						
						
							
							Fix broken url naming in examples
						
						
						
						
						
					 | 
					
						2011-06-07 14:07:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							3531b0b355
							
						
					 | 
					
						
						
							
							More updating docs for 0.2
						
						
						
						
						
						
						
						--HG--
rename : docs/examples/modelresources.rst => docs/examples/modelviews.rst
rename : docs/examples/resources.rst => docs/examples/views.rst 
						
					 | 
					
						2011-06-02 16:03:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							370274f564
							
						
					 | 
					
						
						
							
							Allow views to return HttpResponses.  Add initial() hook method
						
						
						
						
						
					 | 
					
						2011-05-24 10:27:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							c531759147
							
						
					 | 
					
						
						
							
							name and description
						
						
						
						
						
					 | 
					
						2011-05-23 17:07:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c3280f9c0
							
						
					 | 
					
						
						
							
							data flattening needs to go into resource
						
						
						
						
						
					 | 
					
						2011-05-19 08:36:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							75cc1eb2a8
							
						
					 | 
					
						
						
							
							blogpost/views no longer needed
						
						
						
						
						
					 | 
					
						2011-05-16 15:57:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e04790d50
							
						
					 | 
					
						
						
							
							Fixing some of the last blocking issues
						
						
						
						
						
					 | 
					
						2011-05-16 14:11:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							15f9e7c566
							
						
					 | 
					
						
						
							
							refactoring resource specfic stuff into ResourceMixin - validators now defunct
						
						
						
						
						
					 | 
					
						2011-05-12 12:55:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d373b3a067
							
						
					 | 
					
						
						
							
							Decouple views and resources
						
						
						
						
						
					 | 
					
						2011-05-04 09:21:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Christie
							
						 
					 | 
					
						
						
						
						
							
						
						
							8756664e06
							
						
					 | 
					
						
						
							
							emitters -> renderers
						
						
						
						
						
					 | 
					
						2011-05-02 19:49:12 +01:00 | 
					
					
						
						
							
							
							
						
					 |