aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
AgeCommit message (Collapse)Author
2014-07-26Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: rest_framework/fields.py
2014-06-27Merge branch 'master' into modelserialization-charfield-with-nullSerhiy Voyt
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-16typo in the docsTankorSmash
2014-06-12Version 2.3.14Tom Christie
2014-06-08Fixed #1624 (thanks @abraithwaite)Xavier Ordoquy
2014-06-05Replace ChoiceField type_labelkhamaileon
2014-05-30Always use specified content type in APIRequestFactoryDanilo Bargen
If `content_type` is specified in the `APIRequestFactory`, always include it in the request, even if data is empty.
2014-05-26Add the allow_add_remove parameter to the get_serializer methodkhamaileon
2014-05-22Fix _resolve_model to work with unicode stringsPiper Merriam
2014-05-22fields: allow help_text on SerializerMethodFieldJohn Spray
...by passing through any extra *args and **kwargs to the parent constructor. Previously one couldn't assign help_text to a SerializerMethodField during construction.
2014-05-20Merge pull request #1536 from Ian-Foote/choicefield_blank_display_valueTom Christie
Allow customising ChoiceField blank display value
2014-05-19fix pep8allenhu
2014-05-16Added missing import.Xavier Ordoquy
2014-05-16Fixed tests for python 3.4Xavier Ordoquy
2014-05-09Merge pull request #1564 from alumni/masterCarlton Gibson
Fixes #1535 (HTML widget missing `id` attribute)
2014-05-08Updated failing test from #1575Carlton Gibson
2014-05-08Merge pull request #1575 from ewdicus/iso8601Carlton Gibson
Add colon to time zone offset in readable_datetime_formats
2014-05-07Add colon to time zone offset in readable_datetime_formatsElliott
2014-05-07Fixed test.Serhiy Voyt
2014-05-07In case of None value returns empty string instead of NoneType.Serhiy Voyt
2014-05-06Charfied from_native method returns default instead of None. Updated tests.Serhiy Voyt
2014-05-06Extended test with case of saveing model with blank not null field.Serhiy Voyt
2014-05-06Added test case to check if the proper attributes are set on html widgets.Lucian Mocanu
2014-05-06Merge pull request #1485 from Atrasoftware/masterCarlton Gibson
Use help_text, verbose_name, editable attributes for related fields
2014-05-04Automatically set the field name as value for the HTML `id` attribute on the ↵Lucian Mocanu
rendered widget.
2014-05-02Fix missing message in ValidationErrorCharlie Denton
2014-05-01Mark strings in AuthTokenSerializer as translatableCharlie Denton
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 #1409 from tuky/patch-1Xavier Ordoquy
remove spaces from META['HTTP_X_FORWARDED_FOR'] as throttle key
2014-04-29Added help_text to expected response in testEmanuele Pucciarelli
2014-04-29Sync test result w/ new labelEmanuele Pucciarelli
2014-04-29Merge remote-tracking branch 'upstream/master'Emanuele Pucciarelli
Conflicts: rest_framework/tests/models.py
2014-04-28Merge pull request #1543 from sinitsynsv/masterTom Christie
Add help_text and verbose_name attribute mapping for related field
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-27Minor typoKamil Niski
2014-04-24Add help_text and verbose_name attribute mapping for related fieldSergey Sinitsyn
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-16Allow customising ChoiceField blank display valueIan Foote
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