Commit Graph

3787 Commits

Author SHA1 Message Date
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
Anton Shutik
1addd09e2b RelatedField default value handling fixed 2014-02-27 18:34:36 +03: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
Xavier Ordoquy
b2f0f4fcf4 Merge remote-tracking branch 'reference/master' into feature/django_1_7 2014-02-18 11:42:35 +01:00
Xavier Ordoquy
5ae94547bc Moved the python_2_unicode_compatible into compat module. 2014-02-18 11:42:17 +01: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
tuky
5e4336845f Update throttling.py
python 3 u'' gone
2014-02-14 13:47:17 +01: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
Xavier Ordoquy
d498460253 Skip Python 2.6 build for Django 1.7 2014-02-13 13:10:48 +01:00
Xavier Ordoquy
57103587e0 Fixed a typo. 2014-02-13 12:50:04 +01:00
Xavier Ordoquy
c61d311acb Use 1.7a2 for django 1.7 line and added django-guardian PR for python 3.x or django 1.7 tests. 2014-02-13 12:34:50 +01: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
tuky
d18d32669a remove spaces from META['HTTP_X_FORWARDED_FOR'] as throttle key
memcached cannot handle spaces in keys
2014-02-12 18:11:18 +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
Andrey Kaygorodov
f16ad26368 Merge remote-tracking branch 'upstream/master' 2014-02-07 20:59:18 +08:00
Andrey Kaygorodov
2d20512d25 #1390, docs, turning of pagination 2014-02-05 21:10:51 +08: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
Andrey Kaygorodov
d48ba1cff7 turn of pagination 2014-02-05 05:47:27 +08:00