José Padilla
b844cc4bb6
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
...
Conflicts:
rest_framework/serializers.py
2015-02-01 15:34:33 -04:00
José Padilla
37dce89354
Add support for Django 1.8’s ArrayField
2015-02-01 15:33:34 -04:00
Tom Christie
e63f49bd1d
Fix field mappings for 1.8 fields
2015-01-31 19:59:52 +00:00
Tom Christie
2cc4cb2465
Fix error text in test.
2015-01-31 08:53:40 +00:00
Tom Christie
6838f17325
Add built-in translations.
2015-01-30 16:41:21 +00:00
Tom Christie
0d96cf2ca2
Latest translation source messages.
2015-01-30 16:27:49 +00:00
José Padilla
760b25bc20
Fix AttributeError on renamed _field_mapping
2015-01-30 11:36:03 -04:00
Tom Christie
4ee4b4f2dc
Merge master
2015-01-30 14:00:25 +00:00
Tymur Maryokhin
ba7dca893c
Removed router check for deprecated '.model' attribute
2015-01-29 17:28:03 +01:00
Tom Christie
6d89430dd2
Merge pull request #2475 from sdreher/master
...
ManyRelatedField.get_value clearing field on partial update
2015-01-28 09:26:49 +00:00
Tom Christie
81c2562ec4
Merge pull request #2479 from lucaswiman/custom_user_shim_db_table
...
Use the proper db_table argument when constructing meta
2015-01-28 09:20:27 +00:00
Tom Christie
761f264f59
Merge pull request #2473 from tomchristie/reload-settings
...
Reload api_settings when using Django's 'override_settings'
2015-01-28 09:05:51 +00:00
Lucas Wiman
a1eba885e2
Use the proper db_table argument when constructing meta
2015-01-27 19:30:44 -08:00
Brandon Cazander
ac87490b91
Clone the versioning_scheme when necessary. Fixes #2477
2015-01-27 17:10:17 -08:00
Susan Dreher
8c3f82fb18
🐛 ManyRelatedField get_value clearing field on partial update
...
A PATCH to a serializer's non-related CharField was clearing an ancillary StringRelatedField(many=True) field.
The issue appears to be in the ManyRelatedField's get_value method, which was returning a [] instead of empty
when the request data was a MultiDict.
This fix mirrors code in fields.py, class Field, get_value, Ln. 272, which explicitly returns empty on a partial update.
Tests added to demonstrate the issue.
2015-01-27 16:18:51 -05:00
Xavier Ordoquy
5b369bf5fe
Bumped the version.
2015-01-27 19:45:37 +01:00
Tom Christie
65bca59ea5
Reload api_settings when using Django's 'override_settings'
2015-01-27 13:51:30 +00:00
Brandon Cazander
bf58c1265d
Set a version attribute on cloned requests if necessary.
2015-01-26 22:56:57 -08:00
Brandon Cazander
ed04725822
Use enhanced request when cloning requests for checking permissions on other methods. Fixes #2455
2015-01-24 01:44:40 -08:00
Tom Christie
0cb5acee75
Merge pull request #2453 from alexsdutton/data-and-files-none-data
...
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
2015-01-23 18:03:40 +00:00
Alexander Dutton
a1fa7218eb
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
...
In the same vein as #2399 .
2015-01-23 16:52:24 +00:00
Tom Christie
35f6a82462
Added DictField and support for HStoreField.
2015-01-23 16:27:23 +00:00
Tom Christie
889a07f556
Support assignment in ClassLookupDict
2015-01-23 15:32:21 +00:00
Tom Christie
e8db1834d3
Added UUIDField.
2015-01-23 15:24:06 +00:00
Tom Christie
8f25c0c53c
Add 1.8 support
2015-01-23 14:56:15 +00:00
Tom Christie
39f26c9eca
Merge master
2015-01-23 14:28:59 +00:00
Tom Christie
f3b6eedb8a
More sensible response caching.
2015-01-23 12:56:55 +00:00
Tom Christie
f1ac9d3f9b
More graceful handling of malformed Content-Disposition
2015-01-23 12:26:44 +00:00
Tom Christie
25a703b42c
Work around meta API differences
2015-01-23 11:15:11 +00:00
Tom Christie
43d983fae8
Add paging controls
2015-01-22 17:25:12 +00:00
Tom Christie
0822c9e558
Cursor pagination now works with OrderingFilter
2015-01-22 16:12:05 +00:00
Tom Christie
408261ee02
Support ordering attribute either on view or on pagination class for CursorPagination
2015-01-22 15:15:52 +00:00
Tom Christie
83a82b44a5
Support for tuple ordering in cursor pagination
2015-01-22 15:07:01 +00:00
Tom Christie
38a2ed6f62
Python 3 fixes for cursor pagination
2015-01-22 14:04:25 +00:00
Tom Christie
ca372ef6ef
Fix for python 3
2015-01-22 13:50:51 +00:00
Tom Christie
94b5f7a86e
Tidy up cursor tests and make more comprehensive
2015-01-22 12:14:52 +00:00
Tom Christie
f1af603fb0
Tests for reverse pagination
2015-01-22 10:51:04 +00:00
Tom Christie
cae9528c54
Add support for reverse cursors
2015-01-22 10:28:19 +00:00
Tom Christie
5e52f0fd8c
Merge branch 'version-3.1' into cursor-pagination
2015-01-21 20:29:58 +00:00
Xavier Ordoquy
15f797fd3e
Owned by import *
2015-01-21 19:46:31 +01:00
Xavier Ordoquy
857185cf07
Workaround Django issue 24198.
2015-01-21 19:29:40 +01:00
Tom Christie
4cf03e30ff
Do not render HTML output for hidden fields. Closes #2410 .
2015-01-21 14:27:51 +00:00
Tom Christie
e59b3d1718
Make ReturnDict cachable. Closes #2360 .
2015-01-21 14:18:13 +00:00
Tom Christie
9ec08ce578
Merge master
2015-01-21 13:12:14 +00:00
Tom Christie
da6ef3d0b0
Allow missing fields option for inherited serializers. Closes #2388 .
2015-01-21 13:03:37 +00:00
Tom Christie
e5b94f7b7b
Merge branch 'version-3.1' into cursor-pagination
2015-01-19 15:23:08 +00:00
Tom Christie
3cc39ffbce
NotImplemented -> NotImplementedError
2015-01-19 15:22:38 +00:00
Tom Christie
6065cdbd93
Merge master
2015-01-19 15:16:57 +00:00
Tom Christie
fdeef89ba7
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2015-01-19 14:48:42 +00:00
Tom Christie
46a3eda08d
NotImplemented -> NotImplementedError
2015-01-19 14:48:13 +00:00
