Commit Graph

1708 Commits

Author SHA1 Message Date
Stephan Groß
9459289d7d updated comparison due to pep8 programming recommendations
http://www.python.org/dev/peps/pep-0008/#programming-recommendations
2012-11-21 13:35:20 +01:00
Stephan Groß
196fa5e94f Merge pull request #436 from minddust/regex_field
added RegexField
2012-11-21 03:00:02 -08:00
Stephan Groß
03100168ff added missing line 2012-11-21 11:57:00 +01:00
Stephan Groß
6ba4df8a27 Merge remote-tracking branch 'upstream/master' into regex_field
Conflicts:
	docs/topics/release-notes.md
2012-11-21 11:56:34 +01:00
Stephan Groß
ed713d0354 added tests 2012-11-21 11:07:08 +01:00
jedavis83@gmail.com
e03bb9c2fe Change pagination to update Serializer.serialize_fields 2012-11-20 23:17:30 -08:00
jedavis83@gmail.com
8b0561c57e Cache all fields on serializer init, not just default fields. 2012-11-20 23:09:47 -08:00
Mark Aaron Shirley
3b43d41e91 Documentation changes for partial serializer updates 2012-11-20 15:57:54 -08:00
Tom Christie
3268c67343 Update docs/topics/release-notes.md 2012-11-20 23:33:56 +00:00
Tom Christie
8e8b23b6a9 Merge pull request #430 from j4mie/serializer-method-field
Serializer method field
2012-11-20 15:30:30 -08:00
Tom Christie
3227a357ce Added @irrelative for the mighty fine work. 2012-11-20 23:19:11 +00:00
Tom Christie
9b63ba3800 Merge pull request #433 from irrelative/master
Cache default_fields per serializer instance for faster serialization
2012-11-20 15:13:30 -08:00
Mark Aaron Shirley
c3644234cd Add support for partial serializer updates 2012-11-20 11:01:21 -08:00
Dustin Bachrach
7bf03bbd66 Add widgets for DateField and DateTimeField. 2012-11-20 08:27:52 -08:00
Stephan Groß
86484668f6 added RegexField 2012-11-20 15:38:50 +01:00
Jamie Matthews
5f4c385a86 Add example use of SerializerMethodField to docs 2012-11-20 13:25:21 +00:00
Tom Christie
d22daa04e6 Merge pull request #435 from j4mie/fix-serializer-source
Fix related serializers with source argument that resolves to a callable
2012-11-20 01:50:39 -08:00
Jamie Matthews
3cc5349b2f Clean up and clarify tests for related serializers 2012-11-20 09:49:54 +00:00
Jamie Matthews
68c397371c Fix related serializers with source argument that resolves to a callable 2012-11-20 09:41:36 +00:00
jedavis83@gmail.com
2cf0fda2ae Cache default fields per serializer instance for improved performance 2012-11-19 22:09:40 -08:00
Tom Christie
a44a94dd6e More docs tweaking. 2012-11-19 22:08:38 +00:00
Tom Christie
588e4dda6d Added release notes 2012-11-19 21:49:07 +00:00
Tom Christie
83f3770af1 Adding folks to the credits makes me happy. Good work @jonlil! 2012-11-19 21:47:34 +00:00
Tom Christie
cafc00b8e5 Merge pull request #424 from jonlil/master
Support for django 1.5a (auth_user_model)
2012-11-19 13:44:53 -08:00
Tom Christie
ce5b186ca8 Docs tweaks. 2012-11-19 21:42:33 +00:00
Tom Christie
b9e5c9484a Merge pull request #399 from robromano/master
Added login view for users of TokenAuthentication
2012-11-19 13:30:49 -08:00
Tom Christie
25f024575b Merge pull request #426 from jmagnusson/master
Support min_length / max_length kwargs on basic ModelFields
2012-11-19 09:39:59 -08:00
Jamie Matthews
3ab8c4966d Tweaks to SerializerMethodField docs 2012-11-19 17:24:08 +00:00
Jamie Matthews
de5b071d67 Add SerializerMethodField 2012-11-19 17:22:17 +00:00
Tom Christie
4e42ef0bd5 Merge pull request #429 from minddust/minor_fixes
updated to buildin status codes
2012-11-19 08:47:51 -08:00
Stephan Groß
728e505180 updated to buildin status codes 2012-11-19 17:35:32 +01:00
Jonas Liljestrand
acc425e74e Merge branch 'master' of https://github.com/jonlil/django-rest-framework
Conflicts:
	rest_framework/authtoken/migrations/0001_initial.py
2012-11-19 11:38:35 +01:00
Jonas Liljestrand
0bcc840927 Complete fix for migration 2012-11-19 11:37:37 +01:00
Jonas Liljestrand
0ce792eac2 Update rest_framework/authtoken/migrations/0001_initial.py
revert migration
2012-11-19 11:19:45 +01:00
Robert Romano
f5f1ac49ec Update robromano fork with upstream master
Conflicts:
	docs/topics/credits.md
	docs/topics/release-notes.md
2012-11-18 21:07:44 -08:00
Tom Christie
d1472740bc Merge pull request #427 from glic3rinu/master
Fixed identation on filter_fields
2012-11-18 20:36:57 -08:00
glic3rinu
b03804fe05 Fixed identation on filter_fields 2012-11-19 00:14:03 +01:00
Jonas Liljestrand
91c0249c9d fixed migration to support django 1.5 2012-11-18 21:12:06 +01:00
Tom Christie
f131e533ed Docs, docs, docs, docs, docs, docs 2012-11-18 17:57:07 +00:00
Jacob Magnusson
d67ee708e5 Add support for min_length / max_length keywords
on basic ModelFields
2012-11-18 18:14:21 +01:00
Jonas Liljestrand
9f378d0dd4 fixed bug 2012-11-17 23:51:05 +01:00
Jonas Liljestrand
8eb4bb8090 Moved function for getting correct user model to compat.py 2012-11-17 20:35:15 +01:00
Jonas Liljestrand
cd482c0ad2 Added support for Django 1.5 for TokenAuth 2012-11-17 18:04:37 +01:00
Jonas Liljestrand
bbb5a8a1d9 fixed import error 2012-11-17 18:01:46 +01:00
Jonas Liljestrand
3c1b5c3435 indent error 2012-11-17 17:53:08 +01:00
Jonas Liljestrand
f0d4232c1d Django 1.5 support, and awareness for AUTH_USER_MODEL 2012-11-17 17:46:16 +01:00
Tom Christie
346a79b170 Added @MechanisM - Thanks!
(That's a mighty kick ass Gravatar)
2012-11-17 00:29:15 +00:00
Tom Christie
d0524cfcc3 Merge pull request #423 from MechanisM/patch-1
Missing import of "Permission" model in docs
2012-11-16 16:22:56 -08:00
Eugene MechanisM
4068323df4 Missing import of "Permission" model in docs
Missing import of "Permission" model in docs
2012-11-17 04:03:43 +04:00
Tom Christie
2263ed8b94 Tweak 2012-11-16 23:24:36 +00:00