Commit Graph

4210 Commits

Author SHA1 Message Date
Tom Christie
de00ec95c3 Merge master 2013-06-05 13:33:19 +01:00
Tom Christie
2ca243a114 Fix up tests and tox 2013-06-05 13:20:06 +01:00
Areski Belaid
ffdf633aa5 Fix on documentation - wrong reference at previous created view UserList / UserDetail 2013-06-05 14:19:36 +02:00
Tom Christie
f1251e8c58 Added trailing_slash argument to routers. Closes #905 2013-06-04 20:59:12 +01:00
Tom Christie
ffa27b840f Fix ModelField docs. Closes #909. 2013-06-04 20:23:16 +01:00
Tom Christie
c160e49321 Test cases and fix for plain-list relationships (ie not queryset) Closes #878. 2013-06-04 14:05:35 +01:00
Tom Christie
478f6ff94a Regression test for #840. Closes #840. 2013-06-03 21:21:47 +01:00
Tom Christie
87b8cb8524 Merge pull request #904 from menghan/fix-doc-typo
fix doc typo
2013-06-03 08:04:32 -07:00
Tom Christie
28c2c46a03 Version 2.3.5 2013-06-03 12:34:18 +01:00
Tom Christie
6e0567c271 request.user should be still be accessible in renderer context if authentication fails 2013-06-03 12:32:57 +01:00
Tom Christie
11cbf8dca2 Added @copitux for work on #900. Thanks! :) 2013-06-03 09:50:29 +02:00
Tom Christie
62e59f8277 Merge pull request #900 from copitux/fix-validation-layer
Bugfix: Fix run validation layer with invalid data
2013-06-03 00:49:02 -07:00
Tom Christie
b10869a08b Add Django 1.6 to docs and to tox 2013-06-02 21:14:02 +01:00
Tom Christie
1bb5fb8e4a Merge pull request #895 from linovia/django1.6a1
Added Django 1.6a1 to the test matrix.
2013-06-02 13:11:49 -07:00
Tom Christie
a3796f430b Only use test import munging prior to Django 1.6's new test runner 2013-06-02 21:04:47 +01:00
Tom Christie
959ece66e5 Added @aburgel for work on #887. Thank you :) 2013-06-02 20:43:20 +01:00
Tom Christie
27d8b848bc Add notes on 'method' argument to '@action' decorator 2013-06-02 20:40:56 +01:00
Xavier Ordoquy
9d4fc3226e Upgraded the django-oauth2-provider. 2013-06-02 21:34:12 +02:00
Tom Christie
b15a6ccef2 Serializer field 'default' argument may be a callable 2013-06-02 20:12:49 +01:00
Tom Christie
01e80ff9f7 Merge branch 'master' of https://github.com/woakas/django-rest-framework 2013-06-02 20:05:37 +01:00
Tom Christie
372ad01b74 Test cleanup 2013-06-02 19:56:15 +01:00
Tom Christie
bed5bffb73 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-06-02 19:50:59 +01:00
Tom Christie
8b73dce51d view_name argument to HyperlinkedModelSerializer is now properly enforced. Closes #471 2013-06-02 19:50:24 +01:00
Menghan
b8aec1277c fix doc typo 2013-06-02 12:12:14 +08:00
Tom Christie
27520b04e1 Merge pull request #903 from craigteegarden/patch-1
fix typo
2013-05-31 22:42:38 -07:00
Craig Teegarden
9154b09eb9 fix typo 2013-05-31 18:02:47 -04:00
Tom Christie
363b342548 Update release notes 2013-05-31 12:24:36 +01:00
Tom Christie
d7753123f6 HyperlinkedModelSerializer lookup_field option should apply to HyperlinkedIdentityField 2013-05-31 11:50:37 +01:00
Tom Christie
c36ff4e052 Cleaning up imports and whitespace 2013-05-31 11:17:33 +01:00
Tom Christie
fdf9a26740 Remove unused test helper module 2013-05-31 11:14:37 +01:00
Tom Christie
233320691e Rephrase serializer -> form notes in tutorial 2013-05-30 11:47:41 +01:00
Tom Christie
2e566ade39 Release notes 2013-05-30 11:47:21 +01:00
Tom Christie
441cdf8065 Note widget attribute on serializer field. Closes #836. 2013-05-30 11:34:09 +01:00
Tom Christie
8d4bcb4b4c Fix quickstart urls module name. Closes #902 2013-05-30 11:12:19 +01:00
David Medina
c176af35e5 Improve avoid validation test: #900 2013-05-30 09:07:30 +02:00
Gustavo Andrés Angulo
de1cc5f8c1 Fix default field when is a simple callable function. 2013-05-29 11:45:54 -05:00
Tom Christie
c98ac3e83e Added get_url hook to HyperlinkedIdentityField in line with HyperlinedRelatedField. Closes #883 2013-05-29 14:09:31 +01:00
David Medina
d11b55648c Bugfix: Fix run validation layer with invalid data 2013-05-29 12:55:42 +02:00
Xavier Ordoquy
732269160f Use absolute name imports for tests if django version is 1.6+. 2013-05-29 10:18:38 +02:00
Tom Christie
85fe7197bf Change test urls to match 1.6 test module name style 2013-05-29 09:00:30 +01:00
Tom Christie
cb49c5d3c0 Rename test modules to 1.6 style 2013-05-29 08:57:11 +01:00
Stephan Groß
100a168a0b Merge pull request #898 from minddust/fix_md_format
Fix md formatting and typos
2013-05-28 08:15:50 -07:00
Stephan Groß
7a570e16e9 Fix md formatting and typos 2013-05-28 17:13:12 +02:00
Stephan Groß
d7bf02e09e Add @pborreli for #897 2013-05-28 16:43:08 +02:00
Stephan Groß
f6d7f54fc1 Merge pull request #897 from pborreli/typos
Fixed typos
2013-05-28 07:39:56 -07:00
Pascal Borreli
8f35ac4f93 Fixed typos 2013-05-28 15:09:23 +01:00
Xavier Ordoquy
1f03b267cf Added Django 1.6a1 to the test matrix. 2013-05-28 14:49:27 +02:00
Tom Christie
22e1950e1c Backwards compatible approach to HyperlinkedIdentityField URLs. Closes #892 2013-05-28 12:08:36 +01:00
Tom Christie
138f0cacdb Raise 404 on incorrect lookup type in URL, not 500. Closes #890. 2013-05-28 11:57:11 +01:00
Tom Christie
7123f0b1e6 Merge pull request #889 from sebastibe/viewset-doc-typo
Fix doc typo in UserViewSet example
2013-05-26 00:44:53 -07:00