632 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
GitHub Merge Button	b132fc5b32	Merge f0cc46861b into 6207791af1	2012-02-07 02:14:46 -08:00
Tom Christie	6207791af1	Attempt to stop banging head against brick wall.	2012-02-07 10:14:34 +00:00
Tom Christie	8c1e6beb85	Distutils, you are a harsh master.	2012-02-07 09:55:01 +00:00
Tom Christie	f2f8527af2	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2012-02-07 09:47:44 +00:00
Tom Christie	304c995983	Fix distutils errors	2012-02-07 09:47:15 +00:00
Tom Christie	15edc88e70	Tweak	2012-02-07 09:31:08 +00:00
Tom Christie	25b6718111	Tweak	2012-02-07 09:30:08 +00:00
Tom Christie	ee2c8606af	Tweaks.	2012-02-07 09:29:48 +00:00
Tom Christie	15fc26f50b	Fix up packaging and staticfiles changes. Fixes #155. Fixes #153. Fixes #150.	2012-02-07 08:58:15 +00:00
Camille Harang	f0cc46861b	Moved ownership at the BaseResource level, as any resource can provide a Django User, not only a model instance	2012-02-03 03:12:20 +01:00
Tom Christie	87ef85587d	Update AUTHORS	2012-02-02 16:31:40 +00:00
Camille Harang	92da637752	remove debug print	2012-02-02 16:39:24 +01:00
Camille Harang	bab7b6b32b	ModelMixin's .model_instance uses .get_query_kwargs()	2012-02-02 16:35:43 +01:00
Camille Harang	c42a111299	IsModelInstanceOwnerOrIsAnonReadOnly in __all__	2012-02-02 16:12:07 +01:00
Tom Christie	bd25e99f15	Python docs say inherit from Exception, not BaseException.	2012-02-02 09:05:28 +00:00
Tom Christie	1224bb6bb7	Merge pull request #151 from mammique/master ... * should be ** in mixins's self.get_instance(*	2012-02-01 23:59:41 -08:00
Camille Harang	fcd026f506	Doc review for the permission IsModelInstanceOwnerOrIsAnonReadOnly	2012-02-02 03:27:20 +01:00
Camille Harang	ada676123e	Doc for the permission IsModelInstanceOwnerOrIsAnonReadOnly	2012-02-02 03:25:33 +01:00
Camille Harang	6bd2205833	Adding permission IsModelInstanceOwnerOrIsAnonReadOnly	2012-02-02 03:06:55 +01:00
Camille Harang	d44a6c5a69	Adding permission IsModelInstanceOwnerOrIsAnonReadOnly	2012-02-02 03:06:40 +01:00
Camille Harang	52ac21ca3e	Moved ModelMixin's model instance retreival from .get() .put() .delete() to a .model_instance lazy property	2012-02-02 02:54:25 +01:00
Camille Harang	da8187d2c2	* -> **	2012-02-01 23:56:54 +01:00
Tom Christie	894f632598	Remove use of Q objects.	2012-02-01 20:48:32 +00:00
Tom Christie	7886fa2b16	Update test settings for 1.2	2012-02-01 20:24:45 +00:00
Tom Christie	b2fcfffb3b	django-staticfiles for Django 1.2 compatability	2012-01-31 09:05:52 +00:00
Marko Tibold	497d6df5e5	Fix typo.	2012-01-30 21:24:20 +01:00
Marko Tibold	39d4a39441	renamed to CHANGELOG.rst and included release notes in index.rst	2012-01-30 18:29:54 +01:00
Tom Christie	243d80ccb0	Django 1.2 needs django-staticfiles	2012-01-30 16:05:13 +00:00
Tom Christie	50c359c551	Refs #148	2012-01-30 15:54:38 +00:00
Tom Christie	9746bb34cc	Update RELEASES	2012-01-30 14:14:48 +00:00
Tom Christie	278b3576f3	Fixes #148. Thanks @dvinegla.	2012-01-30 14:13:57 +00:00
Tom Christie	c7a8056034	Use named args in mixin tests.	2012-01-29 13:20:03 +00:00
Marko Tibold	289e421543	Add Michele's full name.	2012-01-29 13:46:04 +01:00
Tom Christie	f115be29e0	Latest changelog.	2012-01-28 19:10:07 +00:00
Tom Christie	c0674e36d4	Drop implicit 'pk' on last arg in urlconf. (Too magical).	2012-01-28 19:06:40 +00:00
Tom Christie	765ec0b76e	Use staticfiles for serving css. Fixes #116.	2012-01-28 18:54:02 +00:00
Tom Christie	f34ed6d1f3	0.3.2 Release notes	2012-01-28 17:45:13 +00:00
Tom Christie	22ee89f0f3	Tidy up auto-escaping.	2012-01-28 14:38:11 +00:00
Marko Tibold	bbfa404e46	Fix silly error. This makes more sense.	2012-01-28 15:27:06 +01:00
Marko Tibold	cc226e7e67	moving forward	2012-01-28 14:06:34 +01:00
Marko Tibold	a9e0159481	prepare for tagging	2012-01-28 13:38:29 +01:00
Marko Tibold	76a8c11cf1	Preparing release notes for taggging and uploading to pypi.	2012-01-28 13:37:47 +01:00
Marko Tibold	7af16dc762	Thanks @michelelazzzeri-nextage, if you give your full name, it will be listed here explicitly.	2012-01-28 12:47:16 +01:00
Marko Tibold	cb6f62b2af	fixes #146 ... rest.ep.io now runs tip.	2012-01-27 20:45:53 +01:00
Tom Christie	c1fe5da85f	Refactoring get_name/get_description	2012-01-25 20:39:01 +00:00
Tom Christie	f5e54c7c32	Merge remote-tracking branch 'btimby/description'	2012-01-25 19:53:04 +00:00
Tom Christie	2c3f03c7cb	No longer nameless	2012-01-24 22:04:22 +00:00
Tom Christie	25baa578f9	Added @btimby	2012-01-24 20:27:22 +00:00
Tom Christie	df07616c6c	Merge pull request #144 from btimby/master ... Fix test_with_content_type_args to pass regardless of JSON library idiosyncracies	2012-01-24 12:25:32 -08:00
Ben Timby	d3ec860dd1	Modified test case to pass regardless of JSON library	2012-01-24 14:36:34 -05:00