encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-14 13:46:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,066 Commits 18 Branches 132 Tags 104 MiB
b8c8d10a18
Commit Graph

4066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuele Pucciarelli
fc44cd8d6a Sync test result w/ new label 2014-04-29 21:45:57 +02:00
Emanuele Pucciarelli
f54399ea77 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	rest_framework/tests/models.py
 2014-04-29 21:41:53 +02:00
Tom Christie
161270da99 Merge pull request #1553 from laurentbristiel/master 
typo
 2014-04-29 13:34:58 +01:00
Laurent Bristiel
d8cb85ef8f typo 2014-04-28 22:00:36 +02:00
Tom Christie
1085b64fec Merge pull request #1543 from sinitsynsv/master 
Add help_text and verbose_name attribute mapping for related field
 2014-04-28 20:23:12 +01:00
Xavier Ordoquy
ce2e55a513 Merge pull request #1552 from dpetzel/permissions_guide_response_typo 
very minor typo in code example
 2014-04-28 20:51:19 +02:00
dpetzel
5e8f05a8de very minor typo in code example 2014-04-28 13:51:50 -04:00
Xavier Ordoquy
21810d2643 Merge pull request #1549 from maxpeterson/decode-generate-key 
Ensure Token.generate_key returns a string.
 2014-04-28 14:48:13 +02:00
Max Peterson
73597a16a2 Better Python < 3 compatibility. 2014-04-28 13:13:51 +01:00
Max Peterson
170fa10ae0 Python < 3 compatibility. 2014-04-28 13:10:34 +01:00
Max Peterson
1c777ffe8b Ensure Token.generate_key returns a string. 2014-04-28 12:35:55 +01:00
Xavier Ordoquy
4a1ef6d4b1 Updated Django's versions. 2014-04-27 11:52:33 +02:00
Xavier Ordoquy
db4a8e6f6e Merge pull request #1546 from KaczuH/kaczuh 
Minor typo
 2014-04-27 11:30:34 +02:00
Kamil Niski
82094554e5 Minor typo 2014-04-27 02:54:47 +02:00
Xavier Ordoquy
f4a82dd5da Updated the release notes. 2014-04-24 14:33:36 +02:00
Sergey Sinitsyn
a6e525cf3a Add help_text and verbose_name attribute mapping for related field 2014-04-24 15:58:53 +06:00
Xavier Ordoquy
c5f68fba06 Fixed the issue with django-filters / django 1.7 / pytest 2014-04-17 14:30:33 +02:00
Xavier Ordoquy
f22ed49c64 Upgraded to pytest-django 2.6.1 2014-04-17 11:09:02 +02:00
Xavier Ordoquy
1797a74e82 Merge remote-tracking branch 'pelme/pytest' into feature/pytest 
Conflicts:
	.travis.yml
	rest_framework/runtests/runtests.py
	tests/test_filters.py
	tests/test_pagination.py
	tox.ini
 2014-04-17 09:53:44 +02:00
Ian Foote
6c108c459d Allow customising ChoiceField blank display value 2014-04-16 12:32:04 +01:00
Xavier Ordoquy
1d404874b3 Merge pull request #1527 from Ian-Foote/generic_foreign_key 
Set GenericForeignKey fields on object before save
 2014-04-16 11:27:06 +02:00
Carlton Gibson
03b4c60b2d Merge pull request #1518 from hroncok/patch-1 
Add more TRAILING_PUNCTUATION to work with YAML
 2014-04-15 15:59:25 +02:00
Miro Hrončok
ef1d652827 Introduce tests for urlize_quoted_links() function 2014-04-15 15:33:14 +02:00
Carlton Gibson
c93ddf1750 Merge pull request #1520 from hroncok/patch-2 
Allow unicode YAML dump
 2014-04-15 15:13:51 +02:00
Miro Hrončok
617c982591 Add test for UnicodeYAMLRenderer 2014-04-15 14:12:09 +02:00
Xavier Ordoquy
b3b0515ae6 Merge pull request #1530 from vlastv/patch-3 
Fixed return type
 2014-04-14 11:33:08 +02:00
Vladislav Vlastovskiy
3fe0383572 Fixed convert bytes to str 
Use compact function for convert
 2014-04-14 13:21:24 +04:00
Vladislav Vlastovskiy
d1f4dfca20 Removed decode from test filename 2014-04-14 13:04:18 +04:00
Vladislav Vlastovskiy
d474934d36 Fixed return type 
From bytes to str
 2014-04-14 13:01:24 +04:00
Xavier Ordoquy
f6329b7b5d Merge pull request #1529 from vlastv/patch-1 
Fixed parse file name
 2014-04-14 10:55:56 +02:00
Vladislav Vlastovskiy
063addabfe Removed encode from test 
Django does not produce such a decoding by default, this test was not honest.
 2014-04-14 12:28:41 +04:00
Vladislav Vlastovskiy
4b3eb6e0b0 Fixed parse file name 2014-04-14 12:21:38 +04:00
Ian Foote
853c7a16c1 Use setattr for adding fields to a new instance 
Add test for restoring a GenericForeignKey
 2014-04-13 17:33:45 +01:00
Xavier Ordoquy
d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini
 2014-04-13 00:05:57 +02:00
Ian Foote
0a0e4f22e7 Set GenericForeignKey fields on object before save 
* A model with a required GenericForeignKey can be saved if the field is set
 2014-04-12 17:51:02 +01:00
Xavier Ordoquy
93b9245b87 Merge pull request #1523 from sigilion/master 
Fix dict_keys equality test for python 3.
 2014-04-11 07:17:13 +02:00
Ian Leith
613df5c650 Fix dict_keys equality test for python 3. 2014-04-11 05:49:49 +01:00
Carlton Gibson
8bd5e7e612 Merge pull request #1515 from carltongibson/#1408 
Added test for #1408 — Already Passes
 2014-04-10 15:31:21 +02:00
Miro Hrončok
f68596a732 Document new UnicodeYAMLRenderer 2014-04-10 01:58:06 +02:00
Miro Hrončok
7ae8409370 Allow unicode YAML dump with UnicodeYAMLRenderer 
Fixes #1519
 2014-04-10 01:47:30 +02:00
Miro Hrončok
a23059b6f7 Add more TRAILING_PUNCTUATION to work with YAML. 
Fixes #1517
 2014-04-09 23:35:41 +02:00
Carlton Gibson
a73498d797 Skip new test for Django < 1.6 2014-04-09 19:54:13 +02:00
Carlton Gibson
645ef9895f Merge branch 'refs/heads/master' into #1408 2014-04-09 15:52:26 +02:00
Carlton Gibson
c1ac65edce Adds test that blank option is added when required=False on RelatedFields 2014-04-09 15:51:00 +02:00
Carlton Gibson
b0ba8d61ec Merge pull request #1514 from craigatron/master 
Fix python syntax in filtering docs
 2014-04-09 10:06:35 +02:00
Craig
3234a5dd6b Fix python syntax in filtering docs 2014-04-08 22:56:07 -04:00
Carlton Gibson
4495ac466d Merge pull request #1511 from maurodec/master 
Fixed comment.
 2014-04-08 09:06:25 +02:00
Mauro de Carvalho
2a1571b3bf Fixed comment. 2014-04-07 18:27:59 -03:00
Carlton Gibson
60ac3d7a76 Merge pull request #1510 from uploadcare/docs-page-vs-page-limit 
replace page with page_size to avoide confusion
 2014-04-07 19:35:08 +02:00
Dmitry Mukhin
e45e52a255 replace page with page_size to avoide confusion 2014-04-07 20:39:45 +04:00