Commits · 0876bed96304c3c2125e0de67736d40bfe921cf7 · edx / django-rest-framework · GitLab

21 Nov, 2012 11 commits
- Merge remote-tracking branch 'upstream/master' into partial-update · 0876bed9
  Mark Aaron Shirley committed Nov 21, 2012
  
  0876bed9 Browse Files
- partial argument should override required · 1adfc41d
  Mark Aaron Shirley committed Nov 21, 2012
  
  1adfc41d Browse Files
- Tweak to work with serializer performance improvement · b0bad35e
  Tom Christie committed Nov 21, 2012
  
  b0bad35e Browse Files
- updated comparison due to pep8 programming recommendations · 774d687a
```
http://www.python.org/dev/peps/pep-0008/#programming-recommendations
```
  Stephan Groß committed Nov 21, 2012
  774d687a Browse Files
- added RegexField to field_mapping in BrowsableAPIRenderer · 834f31ae
  Stephan Groß committed Nov 21, 2012
  
  834f31ae Browse Files
- Merge pull request #440 from minddust/master · 28a39219
```
minor docs fix
```
  Stephan Groß committed Nov 21, 2012
  28a39219 Browse Files
- updated comparison due to pep8 programming recommendations · 9459289d
```
http://www.python.org/dev/peps/pep-0008/#programming-recommendations
```
  Stephan Groß committed Nov 21, 2012
  9459289d Browse Files
- Merge pull request #436 from minddust/regex_field · 196fa5e9
```
added RegexField
```
  Stephan Groß committed Nov 21, 2012
  196fa5e9 Browse Files
- added missing line · 03100168
  Stephan Groß committed Nov 21, 2012
  
  03100168 Browse Files
- Merge remote-tracking branch 'upstream/master' into regex_field · 6ba4df8a
```
Conflicts:
	docs/topics/release-notes.md
```
  Stephan Groß committed Nov 21, 2012
  6ba4df8a Browse Files
- added tests · ed713d03
  Stephan Groß committed Nov 21, 2012
  
  ed713d03 Browse Files
20 Nov, 2012 12 commits
- Documentation changes for partial serializer updates · 3b43d41e
  Mark Aaron Shirley committed Nov 20, 2012
  
  3b43d41e Browse Files
- Update docs/topics/release-notes.md · 3268c673
  Tom Christie committed Nov 20, 2012
  
  3268c673 Browse Files
- Merge pull request #430 from j4mie/serializer-method-field · 8e8b23b6
```
Serializer method field
```
  Tom Christie committed Nov 20, 2012
  8e8b23b6 Browse Files
- Added @irrelative for the mighty fine work. · 3227a357
  Tom Christie committed Nov 20, 2012
  
  3227a357 Browse Files
- Merge pull request #433 from irrelative/master · 9b63ba38
```
Cache default_fields per serializer instance for faster serialization
```
  Tom Christie committed Nov 20, 2012
  9b63ba38 Browse Files
- Add support for partial serializer updates · c3644234
  Mark Aaron Shirley committed Nov 20, 2012
  
  c3644234 Browse Files
- added RegexField · 86484668
  Stephan Groß committed Nov 20, 2012
  
  86484668 Browse Files
- Add example use of SerializerMethodField to docs · 5f4c385a
  Jamie Matthews committed Nov 20, 2012
  
  5f4c385a Browse Files
- Merge pull request #435 from j4mie/fix-serializer-source · d22daa04
```
Fix related serializers with source argument that resolves to a callable
```
  Tom Christie committed Nov 20, 2012
  d22daa04 Browse Files
- Clean up and clarify tests for related serializers · 3cc5349b
  Jamie Matthews committed Nov 20, 2012
  
  3cc5349b Browse Files
- Fix related serializers with source argument that resolves to a callable · 68c39737
  Jamie Matthews committed Nov 20, 2012
  
  68c39737 Browse Files
- Cache default fields per serializer instance for improved performance · 2cf0fda2
  jedavis83@gmail.com committed Nov 19, 2012
  
  2cf0fda2 Browse Files
19 Nov, 2012 16 commits
- More docs tweaking. · a44a94dd
  Tom Christie committed Nov 19, 2012
  
  a44a94dd Browse Files
- Added release notes · 588e4dda
  Tom Christie committed Nov 19, 2012
  
  588e4dda Browse Files
- Adding folks to the credits makes me happy. Good work @jonlil! · 83f3770a
  Tom Christie committed Nov 19, 2012
  
  83f3770a Browse Files
- Merge pull request #424 from jonlil/master · cafc00b8
```
Support for django 1.5a (auth_user_model)
```
  Tom Christie committed Nov 19, 2012
  cafc00b8 Browse Files
- Docs tweaks. · ce5b186c
  Tom Christie committed Nov 19, 2012
  
  ce5b186c Browse Files
- Merge pull request #399 from robromano/master · b9e5c948
```
Added login view for users of TokenAuthentication
```
  Tom Christie committed Nov 19, 2012
  b9e5c948 Browse Files
- Merge pull request #426 from jmagnusson/master · 25f02457
```
Support min_length / max_length kwargs on basic ModelFields
```
  Tom Christie committed Nov 19, 2012
  25f02457 Browse Files
- Tweaks to SerializerMethodField docs · 3ab8c496
  Jamie Matthews committed Nov 19, 2012
  
  3ab8c496 Browse Files
- Add SerializerMethodField · de5b071d
  Jamie Matthews committed Nov 19, 2012
  
  de5b071d Browse Files
- Merge pull request #429 from minddust/minor_fixes · 4e42ef0b
```
updated to buildin status codes
```
  Tom Christie committed Nov 19, 2012
  4e42ef0b Browse Files
- updated to buildin status codes · 728e5051
  Stephan Groß committed Nov 19, 2012
  
  728e5051 Browse Files
- Merge branch 'master' of https://github.com/jonlil/django-rest-framework · acc425e7
```
Conflicts:
	rest_framework/authtoken/migrations/0001_initial.py
```
  Jonas Liljestrand committed Nov 19, 2012
  acc425e7 Browse Files
- Complete fix for migration · 0bcc8409
  Jonas Liljestrand committed Nov 19, 2012
  
  0bcc8409 Browse Files
- Update rest_framework/authtoken/migrations/0001_initial.py · 0ce792ea
```
revert migration
```
  Jonas Liljestrand committed Nov 19, 2012
  0ce792ea Browse Files
- Update robromano fork with upstream master · f5f1ac49
```
Conflicts:
	docs/topics/credits.md
	docs/topics/release-notes.md
```
  Robert Romano committed Nov 18, 2012
  f5f1ac49 Browse Files
- Merge pull request #427 from glic3rinu/master · d1472740
```
Fixed identation on filter_fields
```
  Tom Christie committed Nov 18, 2012
  d1472740 Browse Files
18 Nov, 2012 1 commit
- Fixed identation on filter_fields · b03804fe
  glic3rinu committed Nov 19, 2012
  
  b03804fe Browse Files