encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 13:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,921 Commits 18 Branches 132 Tags 105 MiB
9f3c7e8930
Commit Graph

3921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
juroe
b182b9e246 Fixes typo (Implicit instead of Implict). 2014-02-04 11:56:41 +01:00
Tom Christie
9177c74128 Merge pull request #1384 from meshy/patch-1 
Viewsets docs typo
 2014-02-03 07:00:18 -08:00
Charlie Denton
40b148a2e4 Viewsets docs typo 
The docstring in the example said "update" instead of "create".
 2014-02-03 14:54:44 +00:00
Tom Christie
b46b80e464 Merge pull request #1383 from jfw/patch-1 
fixed typo (wrong "its")
 2014-02-03 00:54:31 -08:00
Jeff Fein-Worton
a33eb4177e fixed typo (wrong "its") 2014-02-02 21:21:08 -08:00
Tom Christie
18515fc44b Merge pull request #1381 from meoooh/master 
just little bit modify
 2014-02-01 04:34:34 -08:00
meoooh
e437854a44 Update fields.md 2014-02-01 15:02:11 +09:00
Tom Christie
fab531961b Merge pull request #1379 from bodylabs/exception_example 
Fix doc for custom exception sample
 2014-01-31 09:52:47 -08:00
Paul Melnikow
77ced39e6c Fix doc for custom exception sample 
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-31 12:26:45 -05:00
Tom Christie
8f921160e5 Merge pull request #1377 from Ian-Foote/force_bytes 
Import force_bytes on django >= 1.5
 2014-01-31 03:45:04 -08:00
Xavier Ordoquy
5a662dd60e Moving models back to test_serializer. 2014-01-31 11:20:53 +01:00
Ian Foote
0043f30cab Use bytes BOUNDARY on django < 1.5 
Django's encode_multipart was updated in django 1.5 to work internally
with unicode and convert to bytes.

In django >= 1.5 we therefore need to pass the BOUNDARY as unicode. In
django < 1.5 we still need to pass it as bytes.
 2014-01-31 09:12:45 +00:00
Tom Christie
18f26ff5cc Only add 'Vary: Accept' header when there is more than one possible renderer. 2014-01-30 17:47:55 +00:00