aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/compat.py
AgeCommit message (Collapse)Author
2015-01-30Merge masterTom Christie
2015-01-23Added DictField and support for HStoreField.Tom Christie
2015-01-21Merge masterTom Christie
2015-01-21Allow missing fields option for inherited serializers. Closes #2388.Tom Christie
2015-01-19Merge masterTom Christie
2015-01-19Drop trailing whitespace on indented JSON output. Closes #2429.Tom Christie
2015-01-19Fix timedelta JSON serialization on Python 2.6.Fabien Bochu
2015-01-08Ensure urlparse is not publically exposed in compat.py - less chance of ↵Tom Christie
accidental conflict.
2015-01-06Fix compatibility comment regarding OrderedDictRyan Gaffney
2015-01-05Merge branch 'master' into version-3.1Tom Christie
2014-12-28Support namespaced router URLs with DefaultRouter.Tom Christie
2014-12-16AcceptHeaderVersioning to return unicode strings.Tom Christie
2014-12-15Merge masterTom Christie
2014-12-15Use unicode internally everywhere for 'repr'Tom Christie
2014-12-12Merge masterTom Christie
2014-12-04Removed unused compat codeTymur Maryokhin
2014-12-04Removed custom urlparse compatTymur Maryokhin
2014-12-04Removed custom StringIO, force_text, smart_text compatTymur Maryokhin
2014-12-04Removed custom python_2_unicode_compatible. Closes #2183Tymur Maryokhin
2014-12-03MergeTom Christie
2014-12-03MergeTom Christie
2014-11-29Remove XML support from coreJosé Padilla
2014-11-29Remove YAML support from coreJosé Padilla
2014-11-28Merge branch 'version-3.1' into oauth_as_packageJosé Padilla
Conflicts: requirements-test.txt rest_framework/compat.py tests/settings.py tox.ini
2014-11-15Merge branch 'version-3.1' of github.com:tomchristie/django-rest-framework ↵Eleni Lixourioti
into oauth_as_package Conflicts: .travis.yml
2014-11-06Drop usage of SortedDict. Closes #2027.Tom Christie
2014-10-30Ensure json.dumps(separators=...) works on both 2.x and 3.xTom Christie
2014-10-09First pass on nested serializers in HTMLTom Christie
2014-10-03Minor: fix spelling and grammar, mostly in 3.0 announcementCraig de Stigter
2014-10-01Use six.text_type instead of str everywhereTom Christie
2014-09-26FileField and ImageFieldTom Christie
2014-09-22More compat fixesTom Christie
2014-09-22Ensure 'messages' in fields are respected in preference to default validator ↵Tom Christie
messages
2014-09-10Compat fixesTom Christie
2014-09-10Added help_text argument to fieldsTom Christie
2014-09-05Moved OAuth support out of DRF and into a separate package, per #1767Jharrod LaFon
2014-08-19Drop six from compat. 1.4.2 is now the lowest supported version.Tom Christie
2014-08-19Merge masterTom Christie
2014-07-28Fix #1712 (issue when django-guardian is installed but not configured/used)Xavier Ordoquy
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini
2014-06-08Fixed #1624 (thanks @abraithwaite)Xavier Ordoquy
2014-04-13Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini
2014-03-06it's safe to import scope and constantsEric Buehl
2014-03-05don't implicitly import provider.oauth2Eric Buehl
2014-02-18Merge remote-tracking branch 'reference/master' into feature/django_1_7Xavier Ordoquy
2014-02-18Moved the python_2_unicode_compatible into compat module.Xavier Ordoquy
2014-01-28Import force_bytes on django >= 1.5Ian Foote
2013-12-23Merge branch 'bennbollay-patch-1' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini
2013-12-16Don't import compat.py from authtoken.models. Closes #1297Tom Christie
2013-12-13Compat fixes for django-oauth-plus versions 2.0-2.2.1Tom Christie
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 04:17:21 +0000