aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
AgeCommit message (Collapse)Author
2015-02-06Resolve merge conflictmodel-serializer-cachingTom Christie
2015-02-06Upgrade pending deprecations to deprecationsTom Christie
2015-02-05Fix possible nested array fieldsJosé Padilla
2015-02-04Merge remote-tracking branch 'upstream/version-3.1' into version-3.1José Padilla
2015-02-04Add child to ListField when using ArrayFieldJosé Padilla
2015-02-05Fix NamespaceVersioning with hyperlinked serializer fieldsTom Christie
2015-02-04Merge branch 'version-3.1-2489' of ↵Tom Christie
git://github.com/brandoncazander/django-rest-framework into brandoncazander-version-3.1-2489
2015-02-04Minor authentication message improvement.Tom Christie
2015-02-02Provide rest_framework.resolve. Fixes #2489Brandon Cazander
2015-02-01Merge remote-tracking branch 'upstream/version-3.1' into version-3.1José Padilla
Conflicts: rest_framework/serializers.py
2015-02-01Add support for Django 1.8’s ArrayFieldJosé Padilla
2015-01-31Fix field mappings for 1.8 fieldsTom Christie
2015-01-31Fix error text in test.Tom Christie
2015-01-30Add built-in translations.Tom Christie
2015-01-30Latest translation source messages.Tom Christie
2015-01-30Fix AttributeError on renamed _field_mappingJosé Padilla
2015-01-30Merge masterTom Christie
2015-01-29Removed router check for deprecated '.model' attributeTymur Maryokhin
2015-01-28Merge pull request #2475 from sdreher/masterTom Christie
ManyRelatedField.get_value clearing field on partial update
2015-01-28Merge pull request #2479 from lucaswiman/custom_user_shim_db_tableTom Christie
Use the proper db_table argument when constructing meta
2015-01-28Merge pull request #2473 from tomchristie/reload-settingsTom Christie
Reload api_settings when using Django's 'override_settings'
2015-01-27Use the proper db_table argument when constructing metaLucas Wiman
2015-01-27Clone the versioning_scheme when necessary. Fixes #2477Brandon Cazander
2015-01-27:bug: ManyRelatedField get_value clearing field on partial updateSusan Dreher
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-27Bumped the version.Xavier Ordoquy
2015-01-27Reload api_settings when using Django's 'override_settings'Tom Christie
2015-01-26Set a version attribute on cloned requests if necessary.Brandon Cazander
2015-01-24Use enhanced request when cloning requests for checking permissions on other ↵Brandon Cazander
methods. Fixes #2455
2015-01-23Merge pull request #2453 from alexsdutton/data-and-files-none-dataTom Christie
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
2015-01-23Pass {} as data to DataAndFiles, as it ends up in a MergeDictAlexander Dutton
In the same vein as #2399.
2015-01-23Added DictField and support for HStoreField.Tom Christie
2015-01-23Support assignment in ClassLookupDictTom Christie
2015-01-23Added UUIDField.Tom Christie
2015-01-23Add 1.8 supportTom Christie
2015-01-23Merge masterTom Christie
2015-01-23More sensible response caching.Tom Christie
2015-01-23More graceful handling of malformed Content-DispositionTom Christie
2015-01-23Work around meta API differencesTom Christie
2015-01-22Add paging controlsTom Christie
2015-01-22Cursor pagination now works with OrderingFilterTom Christie
2015-01-22Support ordering attribute either on view or on pagination class for ↵Tom Christie
CursorPagination
2015-01-22Support for tuple ordering in cursor paginationTom Christie
2015-01-22Python 3 fixes for cursor paginationTom Christie
2015-01-22Fix for python 3Tom Christie
2015-01-22Tidy up cursor tests and make more comprehensiveTom Christie
2015-01-22Tests for reverse paginationTom Christie
2015-01-22Add support for reverse cursorsTom Christie
2015-01-21Merge branch 'version-3.1' into cursor-paginationTom Christie
2015-01-21Owned by import *Xavier Ordoquy
2015-01-21Workaround Django issue 24198.Xavier Ordoquy