Commit Graph

3620 Commits

Author SHA1 Message Date
Tom Christie
62786a7ad6 Merge pull request #1444 from DanSears/master
clarified which urls.py to edit
2014-02-28 16:43:17 +00:00
DanSears
abb240648c clarified which urls.py to edit 2014-02-28 08:40:45 -08:00
Tom Christie
22f225175f Merge pull request #1437 from Keats/master
Display the media type of the API response on the browsable API
2014-02-28 11:55:45 +00:00
Tom Christie
22576013b9 Merge pull request #1443 from silent1mezzo/patch-1
Update Travis to test Django 1.6.2
2014-02-28 11:55:05 +00:00
Tom Christie
c3c69f4304 Merge pull request #1441 from dustinfarris/null-serialization
TestCases and POST/PUT'ing serialized data that contains `None`
2014-02-28 09:27:27 +00:00
Tom Christie
1a75e7b02b Merge pull request #1440 from un33k/master
handle zero and negative available_requests
2014-02-28 09:18:03 +00:00
Val Neekman
818b4bf8b3 handle negative time value and prevent a divide by zero 2014-02-27 12:27:54 -08:00
Dustin Farris
f126856f65 Allow 'None' to pass as a null value in RelatedFields 2014-02-27 12:30:59 -05:00
Adam McKerlie
0620263d24 Update Travis to test Django 1.6.2
We should be testing the latest version of Django 1.6 as we're doing in the other 1.x releases.
2014-02-27 11:47:21 -05:00
Keats
6cd0394e20 Display the media type of the API response on the browsable API 2014-02-26 23:47:35 +00:00
Dustin Farris
505f1173d0 Demonstrate problem post/put'ing serialized data that contains 'None' 2014-02-26 12:08:26 -05:00
Tom Christie
6e92e415aa Merge pull request #1436 from meshy/patch-1
Minor docs example fix
2014-02-21 14:24:27 +00:00
Charlie Denton
c3967c08ab Minor docs example fix
Dates are smaller when they happen before.
2014-02-21 14:23:33 +00:00
Tom Christie
9841069373 Link to DRF-extensions. Refs #1430 2014-02-20 14:54:17 +00:00
Tom Christie
0a0dad8c60 Merge pull request #1433 from etoccalino/http-signature
include djangorestframework-httpsignature in the docs
2014-02-20 08:20:06 +00:00
Elvio Toccalino
1a4c6f075b include djangorestframework-httpsignature in the docs 2014-02-20 01:07:39 -03:00
Tom Christie
316b7b8786 Merge pull request #1428 from theskumar/patch-1
fix(docs): fix code indentation in serializers.md
2014-02-18 15:15:18 +00:00
Saurabh Kumar
b3aa512d35 fix(docs): fix code indentation in serializers.md
It fixes the indentation of `restore_object()` in the section "Specifying which fields should be write-only" serializers documentation.
2014-02-18 20:39:39 +05:30
Tom Christie
d328f1827d Tweak comment wrapping. 2014-02-18 12:30:55 +00:00
Tom Christie
68573a3c1a Merge pull request #1427 from Ian-Foote/refactor_update
Refactor UpdateModelMixin.update
2014-02-18 12:29:50 +00:00
Ian Foote
dca8b98356 Remove unnecessary else 2014-02-18 12:28:02 +00:00
Ian Foote
f22aeeb0a3 Refactor UpdateModelMixin.update
Reduce nesting, return early in error cases.
2014-02-18 12:08:12 +00:00
Tom Christie
822eb39599 Merge pull request #1420 from bo-peng/patch-1
Update throttling.md
2014-02-15 11:51:14 +00:00
Bo Peng
6f4c2c6f05 Update throttling.md
Added comma to make DEFAULT_THROTTLE_CLASSES a tuple in example, for copy&paste to work nicely.
2014-02-14 13:47:06 -06:00
Tom Christie
895d660fdc Merge pull request #1418 from ze-phyr-us/docs-api-testing-typo-fix
Minor typos fixed in api-guide/testing.md (request -> response).
2014-02-14 09:49:25 +00:00
Vita Smid
821f848802 Minor typos fixed in api-guide/testing.md (request -> response). 2014-02-14 10:44:02 +01:00
Tom Christie
aaa5885232 Update credits 2014-02-13 17:40:00 +00:00
Tom Christie
c465ceaf5c Merge pull request #1417 from amezhenin/issue_1386
Add myself into credits.md
2014-02-13 17:38:38 +00:00
Artem Mezhenin
3627f7a477 Merge remote-tracking branch 'origin/issue_1386' into issue_1386 2014-02-13 21:25:50 +04:00
Artem Mezhenin
45d89b5d11 credit, issue #1386, PR #1397 2014-02-13 21:25:35 +04:00
Artem Mezhenin
723d3a509b credit, issue #1386, PR #1897 2014-02-13 21:24:29 +04:00
Tom Christie
a06252f812 Merge pull request #1397 from amezhenin/issue_1386
update regex for matching URLs, fixes issue #1386
2014-02-13 16:27:19 +00:00
Artem Mezhenin
dbd993d108 wrapper for smart_urlquote, issue #1386 2014-02-13 20:14:47 +04:00
Artem Mezhenin
08ec23268d (I hope) tests are fixed, issue #1386 2014-02-13 19:39:53 +04:00
Artem Mezhenin
d00ea3bcac change regex back, issue #1386 2014-02-13 18:59:05 +04:00
Tom Christie
69b8ec4ebd Merge pull request #1412 from amatellanes/master
Fixed Testing docs section
2014-02-12 22:22:13 +00:00
amatellanes
0cb08ac707 Fixed Testing docs section 2014-02-12 23:17:05 +01:00
Carlton Gibson
e56ba33d1b Merge pull request #1406 from carltongibson/#1210
Closes #1210.
2014-02-11 20:02:51 +01:00
Carlton Gibson
f1016441f5 Test and fix for #1210. World's lowest hanging fruit. 2014-02-11 19:52:32 +01:00
Carlton Gibson
9a767c21a3 Merge pull request #1405 from carltongibson/#1257
Test and quick fix for #1257
2014-02-11 14:57:56 +01:00
Carlton Gibson
95670933d7 Test and quick fix for #1257 2014-02-11 14:44:56 +01:00
Tom Christie
ac1ea5e651 Merge pull request #1404 from hassanshamim/update-exeptions-documentation
Update Exceptions Documentation
2014-02-10 19:31:24 +00:00
Hassan Shamim
97b7c25987 Replace 'detail' with 'default_detail' in Exceptions guide and APIException class docstring. 2014-02-10 12:54:56 -06:00
Artem Mezhenin
35f4908e48 issue #1386
* regex for matching URLs was rewritten
* added unittests
2014-02-09 02:46:25 +04:00
Artem Mezhenin
41eb313e1c update regex for matching URLs, fixes issue #1386 2014-02-09 01:01:05 +04:00
Tom Christie
00b1877106 Merge pull request #1382 from mking/use-urandom-directly
Generate random token directly
2014-02-05 08:45:30 +00:00
Matthew King
f8cda8adbd Generate random token directly 2014-02-04 22:50:11 -05:00
Tom Christie
74fc6d8f49 Merge pull request #1387 from RicterZ/patch-1
Fixed a bug backticks
2014-02-04 08:41:55 -08:00
RicterZ
ba8a0bac53 Fixed a bug backticks
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-04 23:41:13 +08:00
Tom Christie
b0460a4a58 Merge pull request #1385 from juroe/master
Fixes typo (Implicit instead of Implict).
2014-02-04 03:12:32 -08:00