aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-03-02Support for running the test suite with py.testAndreas Pelme
* Get rid of runtests.py * Moved test code from rest_framework/tests and rest_framework/runtests to tests * Invoke py.test from setup.py * Invoke py.test from Travis * Invoke py.test from tox * Changed setUpClass to be just plain setUp in test_permissions.py * Updated contribution guideline to show how to invoke py.test
2014-02-28Merge pull request #1444 from DanSears/masterTom Christie
clarified which urls.py to edit
2014-02-28clarified which urls.py to editDanSears
2014-02-28Merge pull request #1437 from Keats/masterTom Christie
Display the media type of the API response on the browsable API
2014-02-28Merge pull request #1443 from silent1mezzo/patch-1Tom Christie
Update Travis to test Django 1.6.2
2014-02-28Merge pull request #1441 from dustinfarris/null-serializationTom Christie
TestCases and POST/PUT'ing serialized data that contains `None`
2014-02-28Merge pull request #1440 from un33k/masterTom Christie
handle zero and negative available_requests
2014-02-27handle negative time value and prevent a divide by zeroVal Neekman
2014-02-27Allow 'None' to pass as a null value in RelatedFieldsDustin Farris
2014-02-27Update Travis to test Django 1.6.2Adam McKerlie
We should be testing the latest version of Django 1.6 as we're doing in the other 1.x releases.
2014-02-26Display the media type of the API response on the browsable APIKeats
2014-02-26Demonstrate problem post/put'ing serialized data that contains 'None'Dustin Farris
2014-02-21Merge pull request #1436 from meshy/patch-1Tom Christie
Minor docs example fix
2014-02-21Minor docs example fixCharlie Denton
Dates are smaller when they happen before.
2014-02-20Link to DRF-extensions. Refs #1430Tom Christie
2014-02-20Merge pull request #1433 from etoccalino/http-signatureTom Christie
include djangorestframework-httpsignature in the docs
2014-02-20include djangorestframework-httpsignature in the docsElvio Toccalino
2014-02-18Merge pull request #1428 from theskumar/patch-1Tom Christie
fix(docs): fix code indentation in serializers.md
2014-02-18fix(docs): fix code indentation in serializers.mdSaurabh Kumar
It fixes the indentation of `restore_object()` in the section "Specifying which fields should be write-only" serializers documentation.
2014-02-18Tweak comment wrapping.Tom Christie
2014-02-18Merge pull request #1427 from Ian-Foote/refactor_updateTom Christie
Refactor UpdateModelMixin.update
2014-02-18Remove unnecessary elseIan Foote
2014-02-18Refactor UpdateModelMixin.updateIan Foote
Reduce nesting, return early in error cases.
2014-02-15Merge pull request #1420 from bo-peng/patch-1Tom Christie
Update throttling.md
2014-02-14Update throttling.mdBo Peng
Added comma to make DEFAULT_THROTTLE_CLASSES a tuple in example, for copy&paste to work nicely.
2014-02-14Merge pull request #1418 from ze-phyr-us/docs-api-testing-typo-fixTom Christie
Minor typos fixed in api-guide/testing.md (request -> response).
2014-02-14Minor typos fixed in api-guide/testing.md (request -> response).Vita Smid
2014-02-13Update creditsTom Christie
2014-02-13Merge pull request #1417 from amezhenin/issue_1386Tom Christie
Add myself into credits.md
2014-02-13Merge remote-tracking branch 'origin/issue_1386' into issue_1386Artem Mezhenin
2014-02-13credit, issue #1386, PR #1397Artem Mezhenin
2014-02-13credit, issue #1386, PR #1897Artem Mezhenin
2014-02-13Merge pull request #1397 from amezhenin/issue_1386Tom Christie
update regex for matching URLs, fixes issue #1386
2014-02-13wrapper for smart_urlquote, issue #1386Artem Mezhenin
2014-02-13(I hope) tests are fixed, issue #1386Artem Mezhenin
2014-02-13change regex back, issue #1386Artem Mezhenin
2014-02-12Merge pull request #1412 from amatellanes/masterTom Christie
Fixed Testing docs section
2014-02-12Fixed Testing docs sectionamatellanes
2014-02-11Merge pull request #1406 from carltongibson/#1210Carlton Gibson
Closes #1210.
2014-02-11Test and fix for #1210. World's lowest hanging fruit.Carlton Gibson
2014-02-11Merge pull request #1405 from carltongibson/#1257Carlton Gibson
Test and quick fix for #1257
2014-02-11Test and quick fix for #1257Carlton Gibson
2014-02-10Merge pull request #1404 from hassanshamim/update-exeptions-documentationTom Christie
Update Exceptions Documentation
2014-02-10Replace 'detail' with 'default_detail' in Exceptions guide and APIException ↵Hassan Shamim
class docstring.
2014-02-09issue #1386Artem Mezhenin
* regex for matching URLs was rewritten * added unittests
2014-02-09update regex for matching URLs, fixes issue #1386Artem Mezhenin
2014-02-05Merge pull request #1382 from mking/use-urandom-directlyTom Christie
Generate random token directly
2014-02-04Generate random token directlyMatthew King
2014-02-04Merge pull request #1387 from RicterZ/patch-1Tom Christie
Fixed a bug backticks
2014-02-04Fixed a bug backticksRicterZ
fix you may optionally exclude the ``self.check_object_permissions, and simply return the object from the `get_object_or_404` lookup. to you may optionally exclude the `self.check_object_permissions`, and simply return the object from the `get_object_or_404` lookup.