Commit Graph

6965 Commits

Author SHA1 Message Date
Tom Christie
caf337a4ae Merge pull request #3188 from jpadilla/master
Add missing link to third party resources
2015-07-27 09:17:02 +01:00
José Padilla
4f0220b780 Add missing link 2015-07-26 20:00:34 -04:00
Ion Scerbatiuc
47a22a55ca Added a possible fix 2015-07-25 09:44:00 -07:00
Ion Scerbatiuc
46b65d1647 Added another test case for PK relations 2015-07-25 09:42:27 -07:00
Ion Scerbatiuc
f53c6c7741 Added a test to reproduce the issue 2015-07-25 08:28:46 -07:00
Ion Scerbatiuc
bbd44ae94b Updated the test cases based on the CR comments 2015-07-25 08:22:14 -07:00
Ion Scerbatiuc
085c3e8a2b Fixed python 2.6 compatibility 2015-07-25 08:10:15 -07:00
Ion Scerbatiuc
bf25a6ecbc Test case for using allow_null with many=True and a fix for it 2015-07-25 08:10:15 -07:00
Tom Christie
bdeb28944f Use RuntimeError, not AssertionError when guarding against direct View.queryset evalutation. Refs #3180. 2015-07-24 09:13:39 +01:00
Tom Christie
36d8d3681a Merge pull request #3180 from tomchristie/guarded-queryset
Guard against erroneous direct .queryset evaluation in CBVs.
2015-07-24 09:11:56 +01:00
Tom Christie
108dfafa44 Fix Django 1.5/1.4 compat issue 2015-07-24 09:02:16 +01:00
Tom Christie
c0e3e670ca Fix Django compat for Queryset import 2015-07-23 17:43:49 +01:00
Tom Christie
e05021c8c6 Guard against erronous direct .queryset evaluation in CBVs. 2015-07-23 17:17:18 +01:00
Tom Christie
4c1597efe0 Error modals 2015-07-23 16:16:48 +01:00
Tom Christie
b996266431 Merge master 2015-07-23 15:28:29 +01:00
Tom Christie
9d136abb24 Merge pull request #3179 from tomchristie/browsable-api-errors
Errors in browsable API on error.
2015-07-23 15:25:43 +01:00
Tom Christie
d14bc3c4e1 Fix test cases for python3 2015-07-23 14:41:28 +01:00
Tom Christie
92008d3d16 None -> '' in the context of form field values 2015-07-23 14:36:23 +01:00
Tom Christie
90fe0fb881 Errors in browsable API on error. Closes #3024. 2015-07-23 14:31:25 +01:00
Tom Christie
6e6fa893e4 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-07-23 12:41:44 +01:00
Tom Christie
22631c73a7 Resolve assertion error with LimitOffsetPagination and erronous parameters. Closes #2920. 2015-07-23 12:41:35 +01:00
Tom Christie
e7d14532b0 Merge pull request #3178 from ilogik/master
fixed a typo in docs
2015-07-23 11:21:33 +01:00
Adrian Mester
d9c934debd fixed a typo in docs 2015-07-23 13:10:20 +03:00
Tom Christie
77e69451c1 Update CONTRIBUTING.md 2015-07-22 13:05:56 +01:00
Tom Christie
762a30dbda Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-07-22 12:36:43 +01:00
Tom Christie
f9c61e8090 Prominent notes on deprecation status of pagination settings. Closes #3173. 2015-07-22 12:36:32 +01:00
Tom Christie
cab981837f Merge pull request #3172 from jpadilla/master
Update quickstart.md
2015-07-20 07:17:59 +01:00
José Padilla
7f7e6b33ff Update quickstart.md
Closes #3171
2015-07-19 21:47:09 -04:00
Aider Ibragimov
205f388631 fix import sort order 2015-07-19 01:32:51 +03:00
Aider Ibragimov
c4f1c98572 fix lint issues 2015-07-19 01:22:57 +03:00
Aider Ibragimov
a1397ac699 fix bugs, move version branching to compat, update ModelSerializer mapping 2015-07-19 00:26:03 +03:00
Aider Ibragimov
d845157983 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into feature/filepathfield 2015-07-18 23:34:07 +03:00
Tom Christie
85cc8e9f1a Merge pull request #3168 from tomchristie/error-on-erronous-commit-argument
Helpful error on erronous 'serializer.save(commit=False)'
2015-07-17 12:50:06 +01:00
Tom Christie
138e9fcc8f Helpful error on erronous 'serializer.save(commit=False)' 2015-07-17 12:39:22 +01:00
Tom Christie
b22658536d Merge pull request #3165 from tomchristie/guardian-1-3-support
Upgrade guardian support to 1.3.
2015-07-16 16:55:30 +01:00
Tom Christie
788aae2aaf Upgrade guardian support to 1.3. Closes #3163. 2015-07-16 16:46:07 +01:00
Tom Christie
7b21336872 Rename model to play nice with Django 1.7. 2015-07-16 16:18:14 +01:00
Tom Christie
0b6eb4a881 Fix for Django 1.7 issue with long default verbose_name arguments on ChoiceField 2015-07-16 16:01:50 +01:00
Tom Christie
0ccb148183 Support QueryDict list arguments with ListField. Closes #3155. 2015-07-16 15:59:15 +01:00
Tom Christie
c940f15901 Internal use warning against HTMLFormRenderer. Closes #2773. 2015-07-16 15:50:51 +01:00
Tom Christie
8de13e7e9c Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-07-16 15:46:40 +01:00
Tom Christie
e14391e041 Fix for ModelSerializer ChoiceField with nonstandard args. Closes #3126. 2015-07-16 15:46:27 +01:00
Tom Christie
098ff83eb8 Merge pull request #3162 from lgiordani/fix_tutorial_serializer
Removed import of unused django.forms.widgets
2015-07-16 15:36:55 +01:00
Leonardo Giordani
4f6eba3ce8 Removed import of unused django.forms.widgets 2015-07-16 16:25:01 +02:00
Tom Christie
713333d354 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-07-16 15:17:27 +01:00
Tom Christie
806b0b34da Include nested objects in metadata for OPTIONS. Closes #3156. Closes #2915. 2015-07-16 15:17:18 +01:00
Tom Christie
5c264c0e1f Merge pull request #3161 from tomchristie/allow-empty
Added allow_empty flag
2015-07-16 14:34:36 +01:00
Tom Christie
264d423493 Added allow_empty flag for ListField, ListSerializer, ManyRelation, MultipleChoiceField. 2015-07-16 13:51:15 +01:00
Tom Christie
81709a2c73 Merge pull request #3160 from vstoykov/test-for-3153
Test for #3153
2015-07-16 13:49:59 +01:00
Venelin Stoykov
73c0ebc2d5 Test for #3153 2015-07-16 15:40:41 +03:00