aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-05-01Merge remote-tracking branch 'reference/2.4.0' into feature/pytestXavier Ordoquy
Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini
2014-05-01Fixed new default for manyXavier Ordoquy
2014-05-01Fixed new default for manyXavier Ordoquy
2014-05-01Added missing field for the tests.Xavier Ordoquy
2014-04-30Use url functions from Django itself.Xavier Ordoquy
2014-04-30Merge remote-tracking branch 'reference/master' into feature/pytestXavier Ordoquy
Conflicts: tests/test_serializer.py
2014-04-30Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py
2014-04-30Merge pull request #1391 from kaygorodov/masterXavier Ordoquy
Turning off pagination
2014-04-29Merge pull request #1553 from laurentbristiel/masterTom Christie
typo
2014-04-28typoLaurent Bristiel
2014-04-28Merge pull request #1543 from sinitsynsv/masterTom Christie
Add help_text and verbose_name attribute mapping for related field
2014-04-28Merge pull request #1552 from dpetzel/permissions_guide_response_typoXavier Ordoquy
very minor typo in code example
2014-04-28very minor typo in code exampledpetzel
2014-04-28Merge pull request #1549 from maxpeterson/decode-generate-keyXavier Ordoquy
Ensure Token.generate_key returns a string.
2014-04-28Better Python < 3 compatibility.Max Peterson
2014-04-28Python < 3 compatibility.Max Peterson
2014-04-28Ensure Token.generate_key returns a string.Max Peterson
2014-04-27Updated Django's versions.Xavier Ordoquy
2014-04-27Merge pull request #1546 from KaczuH/kaczuhXavier Ordoquy
Minor typo
2014-04-27Minor typoKamil Niski
2014-04-24Updated the release notes.Xavier Ordoquy
2014-04-24Add help_text and verbose_name attribute mapping for related fieldSergey Sinitsyn
2014-04-17Fixed the issue with django-filters / django 1.7 / pytestXavier Ordoquy
2014-04-17Upgraded to pytest-django 2.6.1Xavier Ordoquy
2014-04-17Merge remote-tracking branch 'pelme/pytest' into feature/pytestXavier Ordoquy
Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini
2014-04-16Merge pull request #1527 from Ian-Foote/generic_foreign_keyXavier Ordoquy
Set GenericForeignKey fields on object before save
2014-04-15Merge pull request #1518 from hroncok/patch-1Carlton Gibson
Add more TRAILING_PUNCTUATION to work with YAML
2014-04-15Introduce tests for urlize_quoted_links() functionMiro Hrončok
2014-04-15Merge pull request #1520 from hroncok/patch-2Carlton Gibson
Allow unicode YAML dump
2014-04-15Add test for UnicodeYAMLRendererMiro Hrončok
2014-04-14Merge pull request #1530 from vlastv/patch-3Xavier Ordoquy
Fixed return type
2014-04-14Fixed convert bytes to strVladislav Vlastovskiy
Use compact function for convert
2014-04-14Removed decode from test filenameVladislav Vlastovskiy
2014-04-14Fixed return typeVladislav Vlastovskiy
From bytes to str
2014-04-14Merge pull request #1529 from vlastv/patch-1Xavier Ordoquy
Fixed parse file name
2014-04-14Removed encode from testVladislav Vlastovskiy
Django does not produce such a decoding by default, this test was not honest.
2014-04-14Fixed parse file nameVladislav Vlastovskiy
2014-04-13Use setattr for adding fields to a new instanceIan Foote
Add test for restoring a GenericForeignKey
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-04-12Set GenericForeignKey fields on object before saveIan Foote
* A model with a required GenericForeignKey can be saved if the field is set
2014-04-11Merge pull request #1523 from sigilion/masterXavier Ordoquy
Fix dict_keys equality test for python 3.
2014-04-11Fix dict_keys equality test for python 3.Ian Leith
2014-04-10Merge pull request #1515 from carltongibson/#1408Carlton Gibson
Added test for #1408 — Already Passes
2014-04-10Document new UnicodeYAMLRendererMiro Hrončok
2014-04-10Allow unicode YAML dump with UnicodeYAMLRendererMiro Hrončok
Fixes #1519
2014-04-09Add more TRAILING_PUNCTUATION to work with YAML.Miro Hrončok
Fixes #1517
2014-04-09Skip new test for Django < 1.6Carlton Gibson
2014-04-09Merge branch 'refs/heads/master' into #1408Carlton Gibson
2014-04-09Adds test that blank option is added when required=False on RelatedFieldsCarlton Gibson
2014-04-09Merge pull request #1514 from craigatron/masterCarlton Gibson
Fix python syntax in filtering docs