Commits · 15c2c58b43a00ec29af99e0478b70eea57560fce · edx / django-rest-framework · GitLab

01 May, 2014 4 commits
- Updated the release-notes. · 15c2c58b
  Xavier Ordoquy committed May 01, 2014
  
  15c2c58b Browse Files
- Use urls functions from django instead of compat. · e5441d84
  Xavier Ordoquy committed May 01, 2014
  
  e5441d84 Browse Files
- Added missing staticfiles app · eb89ed02
  Xavier Ordoquy committed May 01, 2014
  
  eb89ed02 Browse Files
- Merge remote-tracking branch 'reference/2.4.0' into feature/pytest · 7b4463f7
```
Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini
```
  Xavier Ordoquy committed May 01, 2014
  7b4463f7 Browse Files
30 Apr, 2014 7 commits
- Fixed new default for many · c9e6f311
  Xavier Ordoquy committed May 01, 2014
  
  c9e6f311 Browse Files
- Fixed new default for many · 38362bb4
  Xavier Ordoquy committed May 01, 2014
  
  38362bb4 Browse Files
- Added missing field for the tests. · 7475fcea
  Xavier Ordoquy committed May 01, 2014
  
  7475fcea Browse Files
- Use url functions from Django itself. · cd93cd19
  Xavier Ordoquy committed Apr 30, 2014
  
  cd93cd19 Browse Files
- Merge remote-tracking branch 'reference/master' into feature/pytest · 2aca69a9
```
Conflicts:
	tests/test_serializer.py
```
  Xavier Ordoquy committed Apr 30, 2014
  2aca69a9 Browse Files
- Merge remote-tracking branch 'origin/master' into 2.4.0 · 56b43903
```
Conflicts:
	.travis.yml
	rest_framework/serializers.py
	rest_framework/tests/test_authentication.py
```
  Xavier Ordoquy committed Apr 30, 2014
  56b43903 Browse Files
- Merge pull request #1391 from kaygorodov/master · d8fb81ce
```
Turning off pagination
```
  Xavier Ordoquy committed Apr 30, 2014
  d8fb81ce Browse Files
29 Apr, 2014 1 commit
- Merge pull request #1553 from laurentbristiel/master · 161270da
```
typo
```
  Tom Christie committed Apr 29, 2014
  161270da Browse Files
28 Apr, 2014 8 commits
- typo · d8cb85ef
  Laurent Bristiel committed Apr 28, 2014
  
  d8cb85ef Browse Files
- Merge pull request #1543 from sinitsynsv/master · 1085b64f
```
Add help_text and verbose_name attribute mapping for related field
```
  Tom Christie committed Apr 28, 2014
  1085b64f Browse Files
- Merge pull request #1552 from dpetzel/permissions_guide_response_typo · ce2e55a5
```
very minor typo in code example
```
  Xavier Ordoquy committed Apr 28, 2014
  ce2e55a5 Browse Files
- very minor typo in code example · 5e8f05a8
  dpetzel committed Apr 28, 2014
  
  5e8f05a8 Browse Files
- Merge pull request #1549 from maxpeterson/decode-generate-key · 21810d26
```
Ensure Token.generate_key returns a string.
```
  Xavier Ordoquy committed Apr 28, 2014
  21810d26 Browse Files
- Better Python < 3 compatibility. · 73597a16
  Max Peterson committed Apr 28, 2014
  
  73597a16 Browse Files
- Python < 3 compatibility. · 170fa10a
  Max Peterson committed Apr 28, 2014
  
  170fa10a Browse Files
- Ensure Token.generate_key returns a string. · 1c777ffe
  Max Peterson committed Apr 28, 2014
  
  1c777ffe Browse Files
27 Apr, 2014 3 commits
- Updated Django's versions. · 4a1ef6d4
  Xavier Ordoquy committed Apr 27, 2014
  
  4a1ef6d4 Browse Files
- Merge pull request #1546 from KaczuH/kaczuh · db4a8e6f
```
Minor typo
```
  Xavier Ordoquy committed Apr 27, 2014
  db4a8e6f Browse Files
- Minor typo · 82094554
  Kamil Niski committed Apr 27, 2014
  
  82094554 Browse Files
24 Apr, 2014 2 commits
- Updated the release notes. · f4a82dd5
  Xavier Ordoquy committed Apr 24, 2014
  
  f4a82dd5 Browse Files
- Add help_text and verbose_name attribute mapping for related field · a6e525cf
  Sergey Sinitsyn committed Apr 24, 2014
  
  a6e525cf Browse Files
17 Apr, 2014 3 commits
- Fixed the issue with django-filters / django 1.7 / pytest · c5f68fba
  Xavier Ordoquy committed Apr 17, 2014
  
  c5f68fba Browse Files
- Upgraded to pytest-django 2.6.1 · f22ed49c
  Xavier Ordoquy committed Apr 17, 2014
  
  f22ed49c Browse Files
- Merge remote-tracking branch 'pelme/pytest' into feature/pytest · 1797a74e
```
Conflicts:
	.travis.yml
	rest_framework/runtests/runtests.py
	tests/test_filters.py
	tests/test_pagination.py
	tox.ini
```
  Xavier Ordoquy committed Apr 17, 2014
  1797a74e Browse Files
16 Apr, 2014 1 commit
- Merge pull request #1527 from Ian-Foote/generic_foreign_key · 1d404874
```
Set GenericForeignKey fields on object before save
```
  Xavier Ordoquy committed Apr 16, 2014
  1d404874 Browse Files
15 Apr, 2014 4 commits
- Merge pull request #1518 from hroncok/patch-1 · 03b4c60b
```
Add more TRAILING_PUNCTUATION to work with YAML
```
  Carlton Gibson committed Apr 15, 2014
  03b4c60b Browse Files
- Introduce tests for urlize_quoted_links() function · ef1d6528
  Miro Hrončok committed Apr 15, 2014
  
  ef1d6528 Browse Files
- Merge pull request #1520 from hroncok/patch-2 · c93ddf17
```
Allow unicode YAML dump
```
  Carlton Gibson committed Apr 15, 2014
  c93ddf17 Browse Files
- Add test for UnicodeYAMLRenderer · 617c9825
  Miro Hrončok committed Apr 15, 2014
  
  617c9825 Browse Files
14 Apr, 2014 7 commits
- Merge pull request #1530 from vlastv/patch-3 · b3b0515a
```
Fixed return type
```
  Xavier Ordoquy committed Apr 14, 2014
  b3b0515a Browse Files
- Fixed convert bytes to str · 3fe03835
```
Use compact function for convert
```
  Vladislav Vlastovskiy committed Apr 14, 2014
  3fe03835 Browse Files
- Removed decode from test filename · d1f4dfca
  Vladislav Vlastovskiy committed Apr 14, 2014
  
  d1f4dfca Browse Files
- Fixed return type · d474934d
```
From bytes to str
```
  Vladislav Vlastovskiy committed Apr 14, 2014
  d474934d Browse Files
- Merge pull request #1529 from vlastv/patch-1 · f6329b7b
```
Fixed parse file name
```
  Xavier Ordoquy committed Apr 14, 2014
  f6329b7b Browse Files
- Removed encode from test · 063addab
```
Django does not produce such a decoding by default, this test was not honest.
```
  Vladislav Vlastovskiy committed Apr 14, 2014
  063addab Browse Files
- Fixed parse file name · 4b3eb6e0
  Vladislav Vlastovskiy committed Apr 14, 2014
  
  4b3eb6e0 Browse Files