aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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.
2014-02-04Merge pull request #1385 from juroe/masterTom Christie
Fixes typo (Implicit instead of Implict).
2014-02-04Fixes typo (Implicit instead of Implict).juroe
2014-02-03Merge pull request #1384 from meshy/patch-1Tom Christie
Viewsets docs typo
2014-02-03Viewsets docs typoCharlie Denton
The docstring in the example said "update" instead of "create".
2014-02-03Merge pull request #1383 from jfw/patch-1Tom Christie
fixed typo (wrong "its")
2014-02-02fixed typo (wrong "its")Jeff Fein-Worton
2014-02-01Merge pull request #1381 from meoooh/masterTom Christie
just little bit modify
2014-02-01Update fields.mdmeoooh
2014-01-31Merge pull request #1379 from bodylabs/exception_exampleTom Christie
Fix doc for custom exception sample
2014-01-31Fix doc for custom exception samplePaul Melnikow
The way to provide a default detail for APIException is to define a `default_detail` attribute on the subclass. Defining a `detail` attribute without `default_detail` will not work, and will result in empty detail instead.
2014-01-31Merge pull request #1377 from Ian-Foote/force_bytesTom Christie
Import force_bytes on django >= 1.5