Commit Graph

2791 Commits

Author SHA1 Message Date
Tom Christie
760e8642bd Merge branch 'issue-192-expose-fields-for-options' of https://github.com/grimborg/django-rest-framework into improved-options-support 2013-05-24 21:21:56 +01:00
Tom Christie
78c53d530f Updating docs 2013-05-24 21:08:27 +01:00
Oscar Vilaplana
a1deb5eac7 simplified, moved field humanizing to Field. broken tests 2013-05-23 08:26:55 +02:00
Tom Christie
02b29267ac Fix release notes 2013-05-22 21:04:42 +01:00
Tom Christie
7a93fdbe0a Last bits of charset sorting-out-ness 2013-05-22 16:46:15 +01:00
Tom Christie
17699056af Use assertEqual, not assertEquals 2013-05-22 16:45:56 +01:00
Tom Christie
c55406657d Security email address 2013-05-22 16:45:33 +01:00
Tom Christie
0c2b534d95 Minor cleanup 2013-05-22 09:29:43 +01:00
Tom Christie
06b28f66ed Tweak method ordering for better consistency 2013-05-22 09:07:12 +01:00
Tom Christie
0e80a535fb Tweak nav style slightly 2013-05-21 17:45:25 +01:00
Tom Christie
6434a5f4a8 Added @mikee2185 and @mjtorn for their work on #467. Thank you :) 2013-05-21 12:12:39 +01:00
Tom Christie
ac99b81497 Note usage of django-filter 0.5.4 for Django 1.3 support. Closes #877 2013-05-21 12:05:44 +01:00
Tom Christie
39783a6e3c Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-21 12:02:32 +01:00
Tom Christie
cdc3c37465 Merge and styling fixes 2013-05-21 12:01:56 +01:00
Tom Christie
8bbb94dea9 Added @atarzwell for docs fix #876. Thanks! 2013-05-21 12:18:37 +02:00
Tom Christie
f77ae156f9 Merge pull request #876 from atarzwell/master
Incorrect import in Tutorial - Step 6 - ViewSets
2013-05-21 00:18:34 -07:00
Andrew Tarzwell
62c7326b77 Update Typo 2013-05-20 17:43:37 -03:00
Tom Christie
aef7ac72cc content type may be set explicitly on the response 2013-05-20 21:18:17 +01:00
Tom Christie
f19e0d544f Fix charset issues 2013-05-20 21:00:56 +01:00
Tom Christie
6fcffcc9c6 Typo 2013-05-20 14:02:19 +01:00
Tom Christie
26e037d415 Fix broken docs links. Closes #873 2013-05-20 13:49:42 +01:00
Tom Christie
3aad12220d Added @commonorgarden, for fix #875. Thank you :) 2013-05-20 13:46:29 +01:00
Tom Christie
656a13616d Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-05-20 13:43:49 +01:00
Tom Christie
bc8671d7ea More explicit quickstart guide. Closes #867. 2013-05-20 13:43:26 +01:00
Tom Christie
9f455fbc07 Merge pull request #875 from commonorgarden/master
Issue 874 - Update SlugField to raise validation errors for invalid slugs
2013-05-20 05:20:18 -07:00
David Jones
c3fd7c6685 Updated SlugField to raise validation errors for invalid slugs 2013-05-20 13:04:38 +01:00
Tom Christie
ee543e465f Merge pull request #872 from Neamar/master
Removed typo from documentation
2013-05-20 00:53:40 -07:00
Neamar
4c85829cb7 Legacy parameter order 2013-05-20 10:48:07 +03:00
Neamar
42a8fe8995 Corrected docs (authentication instead of filtering) 2013-05-20 10:42:10 +03:00
Oscar Vilaplana
dea0b6ab7f removed TODO 2013-05-19 15:48:16 +02:00
Oscar Vilaplana
259153b3f9 removed TODO 2013-05-19 15:47:50 +02:00
Oscar Vilaplana
9133ef77ab removed TODO 2013-05-19 15:47:23 +02:00
Oscar Vilaplana
7a5cd090aa fixed tests, added docs, renamed helper method 2013-05-19 15:45:33 +02:00
Oscar Vilaplana
6bbedfd7ae fixed merge conflict 2013-05-19 15:18:40 +02:00
Nikolaus Schlemm
31893cff74 * make test assertion more explicit
* cleanup
2013-05-19 15:12:01 +02:00
Oscar Vilaplana
e80488b619 Added min_length and max_length 2013-05-19 15:08:41 +02:00
Oscar Vilaplana
edbf65c06e Removed unused imports 2013-05-19 15:06:24 +02:00
Oscar Vilaplana
696c053f4f s/Single Character/String/ 2013-05-19 15:04:43 +02:00
Nikolaus Schlemm
88c94f3720 Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options 2013-05-19 14:58:11 +02:00
Oscar Vilaplana
f1f5f92d89 Added tests, cleaned up imports 2013-05-19 14:55:46 +02:00
Nikolaus Schlemm
efca5f6fec use double quotes for docstring instead of single quotes 2013-05-19 14:54:16 +02:00
Oscar Vilaplana
400fd6bee4 Merge branch 'issue-192-expose-fields-for-options' of github.com:grimborg/django-rest-framework into issue-192-expose-fields-for-options 2013-05-19 14:00:14 +02:00
Òscar Vilaplana
2a00454517 Merge pull request #2 from nschlemm/issue-192-expose-fields-for-options
Issue 192 expose fields for options
2013-05-19 05:00:01 -07:00
Nikolaus Schlemm
b07cfdcf54 FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate 2013-05-19 13:54:13 +02:00
Oscar Vilaplana
19f838f655 Merge branch 'issue-192-expose-fields-for-options' of github.com:nschlemm/django-rest-framework into issue-192-expose-fields-for-options 2013-05-19 13:46:46 +02:00
Nikolaus Schlemm
5473f60192 Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options 2013-05-19 13:46:17 +02:00
Nikolaus Schlemm
1154c12b33 don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate 2013-05-19 11:37:12 +02:00
Nikolaus Schlemm
a91841f7fe WORKAROUND: avoid errors like "AttributeError: 'APIRoot' object has no attribute 'get_serializer'" 2013-05-19 11:29:41 +02:00
Oscar Vilaplana
08e9e2042c Disabled label and help_text in unit test. We should change the test so
that it sets them up.
2013-05-19 11:26:56 +02:00
Oscar Vilaplana
b915c1d4d8 Made field label optional in OPTIONS 2013-05-19 11:15:38 +02:00