Marko Tibold
919aff329e
Fix AttributeError caused by accessing a non-existing default_keys attribute.
2012-12-07 00:08:27 +01:00
Tom Christie
a463ddbb37
Merge pull request #470 from minddust/fix-#469
...
fixed #469 - RegexField <--> BrowsableAPI Bug
2012-12-06 14:58:18 -08:00
Tom Christie
26cfa02326
Added @roberts81. Thanks!
2012-12-06 22:56:23 +00:00
Tom Christie
6ffcd7ba36
Merge pull request #477 from roberts81/master
...
Fix for #460
2012-12-06 14:54:28 -08:00
Marko Tibold
c65f22e0e4
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into #431
2012-12-06 23:47:47 +01:00
Tom Christie
6a5f4f2a90
Added @justanotherbody. Thanks!
2012-12-06 22:38:20 +00:00
Tom Christie
bd530a2ee4
Merge pull request #474 from justanotherbody/master
...
Add support for "true" and "false" as BooleanField values
2012-12-06 14:36:49 -08:00
Tom Christie
e2175eb71b
Merge pull request #462 from asfaltboy/modelserializer_traverse_related
...
ModelSerializer traverse related
2012-12-06 14:35:57 -08:00
Tom Christie
2938bc13b1
Added @reinout for the copy fixes. Thanks!
2012-12-06 16:30:22 -04:00
Tom Christie
1cf6a0469b
Merge pull request #475 from reinout/master
...
Textual tutorial fixes
2012-12-06 12:27:12 -08:00
Ben Roberts
cb7d9ea5c9
cleaned up white space & docstring styling
2012-12-06 12:45:50 -07:00
Ben Roberts
7f28a78414
cleaned up last commit
2012-12-05 17:54:21 -07:00
Ben Roberts
705c7ad09d
added tests and fix for unpickleable metadata in SortedDictWithMetadata
2012-12-05 17:43:47 -07:00
Reinout van Rees
7a110a3006
Two typo fixes.
...
Plural/singular fix.
Typo fixed.
2012-12-05 16:24:41 +01:00
Reinout van Rees
3f39828788
Small textual fixes.
2012-12-05 16:16:46 +01:00
Reinout van Rees
ee184b8629
Small textual fixes.
2012-12-05 16:08:13 +01:00
Reinout van Rees
cb4e857217
Textual fixes.
...
Added a sentence introducing the second view.
Fix one or two additional sentences.
2012-12-05 16:04:52 +01:00
Marko Tibold
3868241f6a
Update docs/api-guide/permissions.md
...
@permission_classes takes a tuple or list.
2012-12-05 15:09:06 +01:00
Reinout van Rees
3417c4631d
Fixed typos and fixed wording.
...
Some singular/plural fixes.
Fixed some 'serialise->serialize' kind of UK/US differences. The 'z' seems more common in the rest of the docs, so that's what I used.
Removed a half-finished-sentence left dangling somewhere.
2012-12-05 12:31:38 +01:00
Reinout van Rees
fc6dbb45e0
Fixed wording.
2012-12-05 12:20:03 +01:00
Michael Richards
3867d9deb1
Added support for 'true'/'false' as valid boolean data
2012-12-04 11:07:31 -08:00
Stephan Groß
e044fa089b
fixed #469 - RegexField <--> BrowsableAPI Bug
2012-12-04 09:40:23 +01:00
Stephan Groß
3e3ede71d2
Added @mvdwaeter. Thanks!
2012-12-03 12:47:12 +01:00
Tom Christie
45d28f49e0
Added @mhsparks. Thanks!
2012-12-02 11:04:34 -04:00
Tom Christie
56bb4a5b03
Merge pull request #448 from mhsparks/master
...
Add setter to user property on request object
2012-12-02 06:59:27 -08:00
Xavier Ordoquy
5fad46d7e2
Merge remote-tracking branch 'reference/master' into p3k
2012-12-02 12:43:32 +01:00
Xavier Ordoquy
fa53dde576
Reactivated the python 2.6 tests.
2012-12-02 01:26:02 +01:00
Xavier Ordoquy
d6b4a6b04a
Fixed a bug with type and python 2.x compat.
2012-12-02 01:24:15 +01:00
Xavier Ordoquy
73572bc199
trunk bug.
2012-12-02 01:23:39 +01:00
Xavier Ordoquy
364299b0aa
py3 compatible setup.
2012-12-02 01:23:03 +01:00
Marko Tibold
3114b4fa50
Merge pull request #463 from mvdwaeter/patch-1
...
Fixed typo in import statement of tutorial
2012-11-30 13:32:08 -08:00
mvdwaeter
3e8336af50
Fixed typo in import statement of tutorial
2012-11-30 21:50:51 +01:00
Marko Tibold
52b12434d0
Merge pull request #458 from asfaltboy/fix_authtoken_response
...
Fix authtoken response
2012-11-30 11:58:10 -08:00
Pavel Savchenko
1c1bd3fc5d
fix test response
2012-11-30 01:37:21 +02:00
Pavel Savchenko
e311b763e1
add traverse_related feature + tests (fixes issue#461)
2012-11-30 01:34:46 +02:00
Tom Christie
8d485da483
Added @fabianbuechler. Thanks!
2012-11-29 19:05:34 -04:00
Tom Christie
c72a20c459
Merge pull request #452 from fabianbuechler/patch-1
...
Renderer negotiation: media_type specificty evaluation weak
2012-11-29 15:02:32 -08:00
Pavel Savchenko
1b9d0eefba
fix forgotten 400 test
2012-11-29 09:35:22 +02:00
Marko Tibold
968f4a5ca4
Merge branch 'custom-serializer-form-class' of https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390
...
Conflicts:
rest_framework/fields.py
rest_framework/renderers.py
Manually solved
2012-11-29 01:10:32 +01:00
Marko Tibold
60def44ee2
Merge pull request #459 from onepercentclub/update-options
...
Update django-filter to released version.
2012-11-28 14:46:45 -08:00
Ben Konrath
2f6cecc9a4
Update django-filter to released version.
2012-11-28 23:22:10 +01:00
Pavel Savchenko
19f67bd578
also update test with response code 401
2012-11-28 23:05:33 +02:00
Pavel Savchenko
050e228edc
Merge branch 'patch-2' of https://github.com/asfaltboy/django-rest-framework into fix_authtoken_response
2012-11-28 23:04:10 +02:00
Stephan Groß
0a4c9f0831
Merge pull request #456 from asfaltboy/fix_auth_token_docs
...
Fix location of obtain_auth_token view
2012-11-28 08:01:57 -08:00
Pavel Savchenko
7eec582d40
Better to return 401 when failing to authenticate
2012-11-28 17:04:36 +02:00
Pavel Savchenko
fd383b2b5e
Fix location of obtain_auth_token view
2012-11-28 11:58:34 +02:00
Xavier Ordoquy
bf8ceca122
Updated the build to use django 1.5 beta 1.
2012-11-28 10:52:03 +01:00
Stephan Groß
11ef60b127
Added @yprez Thanks!
2012-11-28 07:32:12 +01:00
Stephan Groß
77fa98d839
Merge pull request #453 from yprez/docs_fix
...
api-guide/views.md - add imports to code example
2012-11-27 22:30:13 -08:00
Marko Tibold
899f96ae91
Added a get_excluded_fieldnames() method.
...
Model validation now excludes fields not listed in Meta fields (if set).
2012-11-27 23:49:27 +01:00
