Tom Christie
|
d9c7b1c585
|
Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into working
Conflicts:
rest_framework/authentication.py
rest_framework/relations.py
rest_framework/serializers.py
rest_framework/settings.py
rest_framework/tests/authentication.py
rest_framework/tests/genericrelations.py
rest_framework/tests/generics.py
rest_framework/tests/relations_hyperlink.py
rest_framework/tests/relations_nested.py
rest_framework/tests/relations_pk.py
rest_framework/tests/serializer.py
|
2013-02-01 11:58:55 +00:00 |
|
Xavier Ordoquy
|
60250f22c8
|
Move the various compat things to the compat module.
|
2013-01-03 11:41:07 +01:00 |
|
Xavier Ordoquy
|
cf51dcc9bb
|
Straight import is enough.
|
2013-01-03 10:48:43 +01:00 |
|
Xavier Ordoquy
|
4b77b3c5ad
|
Move the urlparse lib compatibility to the compat file.
|
2013-01-02 19:06:55 +01:00 |
|
Xavier Ordoquy
|
737349d238
|
Merge remote-tracking branch 'reference/py3k' into p3k
|
2013-01-02 16:09:21 +01:00 |
|
Andrew Hankinson
|
c6f212238c
|
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into patch-support
|
2012-12-30 14:03:08 -04:00 |
|
Tom Christie
|
a493c83248
|
urls, patterns, include imports move to compat to support incoming 1.3 thru 1.6 import compatability
|
2012-12-19 23:12:27 +00:00 |
|
Andrew Hankinson
|
4f96951be9
|
Add 'patch' http method support to the Django View object
|
2012-12-16 13:11:59 -05:00 |
|
Tom Christie
|
4058223309
|
Fix broken nested fields
|
2012-12-11 21:07:25 +00:00 |
|
Xavier Ordoquy
|
e348ee9255
|
52 tests passing. Refactored a few string / byte io.
|
2012-11-23 01:12:33 +01:00 |
|
Xavier Ordoquy
|
49f8e6419a
|
Fixed python2.7 compat issue.
|
2012-11-22 00:43:56 +01:00 |
|
Xavier Ordoquy
|
b3698acb6c
|
First passing test under p3k \o/
|
2012-11-22 00:20:49 +01:00 |
|
Jonas Liljestrand
|
91c0249c9d
|
fixed migration to support django 1.5
|
2012-11-18 21:12:06 +01:00 |
|
Jonas Liljestrand
|
9f378d0dd4
|
fixed bug
|
2012-11-17 23:51:05 +01:00 |
|
Jonas Liljestrand
|
8eb4bb8090
|
Moved function for getting correct user model to compat.py
|
2012-11-17 20:35:15 +01:00 |
|
Stephan Groß
|
44ff2e0add
|
fixed some typos
|
2012-11-14 19:36:29 +01:00 |
|
glic3rinu
|
61ec6c0912
|
Fixed typo on safe_mode markdown wrapper
|
2012-11-09 16:54:23 +01:00 |
|
Tom Christie
|
47b534a13e
|
Make filtering optional, and pluggable.
|
2012-11-07 21:07:24 +00:00 |
|
Tom Christie
|
44207a347a
|
pep8
|
2012-10-27 10:33:01 +01:00 |
|
Tom Christie
|
4ebd701be7
|
Fix serialization issue with Django 1.3
|
2012-09-28 14:53:22 +01:00 |
|
Tom Christie
|
284a700e09
|
head method on views for Django 1.3. Fixes #228
|
2012-09-27 13:34:28 +01:00 |
|
Tom Christie
|
d2583b809c
|
Remove parse_qs from compat, now py2.5 support is dropped
|
2012-09-27 13:08:57 +01:00 |
|
Tom Christie
|
91b3fb0b05
|
Remove RequestFactory from compat (Now 1.2 is not supported)
|
2012-09-27 13:06:04 +01:00 |
|
Tom Christie
|
4b691c4027
|
Change package name: djangorestframework -> rest_framework
|
2012-09-20 13:06:27 +01:00 |
|