Tom Christie
|
d3440f0311
|
Merge pull request #1282 from daaray/patch-1
Update routers.md
|
2013-12-11 01:09:20 -08:00 |
|
David Ray
|
7382f8c6ad
|
Update routers.md
Reference to ```DefaultRouter``` should be ```SimpleRouter```
|
2013-12-10 14:56:07 -05:00 |
|
Alan Justino
|
d3a118c728
|
SimpleRouter.get_lookup_regex got lookup_prefix
This allows @alanjds/drf-nested-routers to not duplicate/monkeypatch work made here
|
2013-12-10 17:14:17 -02:00 |
|
Tom Christie
|
462c5e3d0d
|
Merge pull request #1280 from tomchristie/fix-1205
Refine model manager behavior so as not to use the behavior in incorrect...
|
2013-12-10 00:54:11 -08:00 |
|
Tom Christie
|
c09ad1bedc
|
Remove incorrect apostrophe
|
2013-12-10 08:53:38 +00:00 |
|
Tom Christie
|
40164fcc62
|
Update release notes
|
2013-12-10 08:49:54 +00:00 |
|
Tom Christie
|
3a1c40f814
|
Refine model manager behavior so as not to use the behavior in incorrect cases. Closes #1205
|
2013-12-10 08:46:44 +00:00 |
|
Tom Christie
|
785a42cd5a
|
Tweak REST condition text.
|
2013-12-10 08:38:43 +00:00 |
|
Tom Christie
|
e6dfc06f91
|
Merge pull request #1278 from caxap/master
Added REST Condition to 3rd party permissions packages list.
|
2013-12-10 00:36:09 -08:00 |
|
Maxim Kamenkov
|
9ba7be959c
|
Added REST Condition to 3rd party permissions packages list.
|
2013-12-09 20:33:06 +02:00 |
|
Tom Christie
|
b599447b71
|
Merge pull request #1277 from Ian-Foote/master
Fix typo "Not" -> "Note"
|
2013-12-09 01:54:37 -08:00 |
|
Ian
|
de319f3e28
|
Fix typo "Not" -> "Note"
|
2013-12-09 09:53:16 +00:00 |
|
Tom Christie
|
2c898bd901
|
Update release notes
|
2013-12-09 09:27:10 +00:00 |
|
Tom Christie
|
ddd17c69e7
|
Fix compat issues for #1231
|
2013-12-09 09:24:10 +00:00 |
|
Tom Christie
|
a6ca943faa
|
Merge branch 'issue-1231-jsonencoder' of git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder
|
2013-12-09 08:50:31 +00:00 |
|
Tom Christie
|
c1be503308
|
Add notes to contributing docs
|
2013-12-09 08:46:18 +00:00 |
|
Tom Christie
|
e6f6bb5c7e
|
Add notes to contributing docs
|
2013-12-09 08:42:09 +00:00 |
|
Tom Christie
|
23369650e3
|
Add notes to contributing docs
|
2013-12-09 08:14:21 +00:00 |
|
Tom Christie
|
e80b353085
|
Add notes to contributing docs
|
2013-12-09 08:10:51 +00:00 |
|
Tom Christie
|
712ab8e3dc
|
Merge pull request #1262 from tomchristie/fix-1261
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
|
2013-12-08 23:52:55 -08:00 |
|
Tom Christie
|
5eca31d161
|
Merge pull request #1275 from qooleot/master
RelatedField is function of serializer class
|
2013-12-08 23:46:55 -08:00 |
|
Tom Christie
|
80ef2685e5
|
Merge master
|
2013-12-09 07:45:45 +00:00 |
|
Tom Christie
|
175b4d233d
|
Merge pull request #1276 from lalkaka/master
Minor grammar fix -- 'team' is singular
|
2013-12-08 23:38:32 -08:00 |
|
Tom Christie
|
4e9385e709
|
Drop unneeded assert
|
2013-12-09 07:37:13 +00:00 |
|
Tom Christie
|
06d8a31e13
|
Catch and mask ParseErrors that occur during rendering of the BrowsableAPI.
|
2013-12-09 07:34:08 +00:00 |
|
Rustam Lalkaka
|
b8732d2165
|
Minor grammar fix -- 'team' is singular
|
2013-12-08 19:34:24 -05:00 |
|
taras
|
3399158d62
|
RelatedField is function of serializer class
|
2013-12-08 11:40:40 -05:00 |
|
Tom Christie
|
14ae301254
|
Merge pull request #1274 from wilsaj/patch-1
docfix: update installation example to work with django 1.6
|
2013-12-07 05:20:41 -08:00 |
|
Andy Wilson
|
db19fba50d
|
update installation example to work with django 1.6
looks like django.conf.urls.defaults was deprecated as of django 1.6
|
2013-12-06 22:31:07 -06:00 |
|
kahnjw
|
23db6c9849
|
PEP8 Compliance
|
2013-12-06 14:52:39 -08:00 |
|
kahnjw
|
887da7f6c5
|
Add missing tick marks
|
2013-12-06 14:30:33 -08:00 |
|
kahnjw
|
196c5952e4
|
Fix typo
|
2013-12-06 14:24:16 -08:00 |
|
kahnjw
|
100a933279
|
Add documentation to explain what effect these changes have.
|
2013-12-06 14:22:08 -08:00 |
|
kahnjw
|
89f26c5e04
|
Add get_ident method to pass new tests.
|
2013-12-06 14:21:52 -08:00 |
|
kahnjw
|
9ab0759e38
|
Add tests to pass for get_ident method in BaseThrottle class.
|
2013-12-06 14:21:33 -08:00 |
|
Tom Christie
|
910de38a9c
|
Version 2.3.10
|
2013-12-06 22:13:50 +00:00 |
|
Tom Christie
|
85d9eb0f7e
|
Update release-notes.md
|
2013-12-06 21:47:26 +00:00 |
|
Tom Christie
|
51359e4612
|
Added @chuckharmston for kickass bug squashing in #1272
|
2013-12-06 21:42:52 +00:00 |
|
Tom Christie
|
e05fac685b
|
Merge pull request #1272 from chuckharmston/1158-partial_relatedfield_null
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158)
|
2013-12-06 13:40:35 -08:00 |
|
Chuck Harmston
|
cf6c11bd4b
|
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158)
|
2013-12-06 14:00:23 -06:00 |
|
Tom Christie
|
e155534f4f
|
Merge pull request #1270 from irrelative/master
fix setup.py with new __init__.py boilerplate
|
2013-12-06 02:09:10 -08:00 |
|
Justin Davis
|
79596dc613
|
fix setup.py with new __init__.py boilerplate
|
2013-12-05 13:17:23 -08:00 |
|
Tom Christie
|
1f8069c0a9
|
Boilerplate cuteness
|
2013-12-05 11:05:25 +00:00 |
|
Tom Christie
|
f8088bedef
|
Upgrade JSONP security warning.
|
2013-12-05 09:01:00 +00:00 |
|
Tom Christie
|
b88e537802
|
Merge pull request #1269 from infecto/master
fix broken documentation links
|
2013-12-05 00:16:43 -08:00 |
|
Drew Kowalik
|
f2682537e0
|
fix broken documentation links
|
2013-12-04 16:10:05 -08:00 |
|
Tom Christie
|
6446b44f01
|
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
|
2013-12-04 14:59:28 +00:00 |
|
Tom Christie
|
de5b9e39dd
|
First pass on contribution guide
|
2013-12-04 14:59:09 +00:00 |
|
Tom Christie
|
04a43ddca5
|
Merge pull request #1267 from tomchristie/fix-1133
Clarify wording, fixes #1133.
|
2013-12-04 00:52:07 -08:00 |
|
Tom Christie
|
3c3906e278
|
Clarify wording, fixes #1133.
|
2013-12-04 08:51:34 +00:00 |
|