aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-11-19updated to buildin status codesStephan Groß
2012-11-19Merge branch 'master' of https://github.com/jonlil/django-rest-frameworkJonas Liljestrand
Conflicts: rest_framework/authtoken/migrations/0001_initial.py
2012-11-19Complete fix for migrationJonas Liljestrand
2012-11-19Update rest_framework/authtoken/migrations/0001_initial.pyJonas Liljestrand
revert migration
2012-11-18Update robromano fork with upstream masterRobert Romano
Conflicts: docs/topics/credits.md docs/topics/release-notes.md
2012-11-18Merge pull request #427 from glic3rinu/masterTom Christie
Fixed identation on filter_fields
2012-11-19Fixed identation on filter_fieldsglic3rinu
2012-11-18fixed migration to support django 1.5Jonas Liljestrand
2012-11-18Docs, docs, docs, docs, docs, docsTom Christie
2012-11-18Add support for min_length / max_length keywordsJacob Magnusson
on basic ModelFields
2012-11-17fixed bugJonas Liljestrand
2012-11-17Moved function for getting correct user model to compat.pyJonas Liljestrand
2012-11-17Added support for Django 1.5 for TokenAuthJonas Liljestrand
2012-11-17fixed import errorJonas Liljestrand
2012-11-17indent errorJonas Liljestrand
2012-11-17Django 1.5 support, and awareness for AUTH_USER_MODELJonas Liljestrand
2012-11-17Added @MechanisM - Thanks!Tom Christie
(That's a mighty kick ass Gravatar)
2012-11-16Merge pull request #423 from MechanisM/patch-1Tom Christie
Missing import of "Permission" model in docs
2012-11-17Missing import of "Permission" model in docsEugene MechanisM
Missing import of "Permission" model in docs
2012-11-16TweakTom Christie
2012-11-16Improve pagination docsTom Christie
2012-11-16TidyingTom Christie
2012-11-16Version 2.1.32.1.3Tom Christie
2012-11-16Merge pull request #422 from markotibold/max_length_for_modelserializersTom Christie
Max length for modelserializers
2012-11-16Getting 2.1.3 release notes readyTom Christie
2012-11-16Merge pull request #408 from markotibold/file_and_image_fieldsTom Christie
Added a FileField and an ImageField
2012-11-16Polishing to page size query parameters & more docsTom Christie
2012-11-16Simplified docs a bit for FileField and ImageField.Marko Tibold
Added note about MultipartParser only supporting file uploads and Django's default upload handlers.
2012-11-16Added brief docs for URLField and SlugField.Marko Tibold
2012-11-16Merge pull request #412 from minddust/custom_page_size_per_requestTom Christie
support for custom page size per request
2012-11-16Added URLField and SlugField.Marko Tibold
Fixed test_modelserializer_max_length_exceeded
2012-11-16Minor tweaks to internals of generics and mixinsTom Christie
2012-11-16Whoops … Drop pdbMarko Tibold
2012-11-16Fixes #421Marko Tibold
2012-11-16Merge pull request #419 from markotibold/the_feature_nobody_asked_forTom Christie
./mkdocs.py -p opens a preview in your default browser
2012-11-16Docs, tox and travis use django-filter 0.5.4Tom Christie
2012-11-16Reproduces #421Marko Tibold
2012-11-16Fix typoTom Christie
2012-11-16WIP on docs for File- and ImageFileds.Marko Tibold
2012-11-15./mkdocs.py -p opens a preview in your default browser. Tested on Mac, but ↵Marko Tibold
should work on windows and Linux as well.
2012-11-15Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into ↵Marko Tibold
file_and_image_fields
2012-11-15added page_size_kwarg testsStephan Groß
2012-11-15updated script to just use page_size_kwargStephan Groß
2012-11-15updated release noted for page_size stuffStephan Groß
2012-11-15added global and per resource on/off switch + updated docsStephan Groß
2012-11-14Fix 404Marko Tibold
Fixes #417
2012-11-14Added a test for the FileField.Marko Tibold
2012-11-14Merge branch 'master' of https://github.com/robromano/django-rest-frameworkRob Romano
Conflicts: docs/api-guide/authentication.md docs/topics/credits.md
2012-11-14Removed authtoken/urls.py, not really needed with Tom's simplificationRob Romano
2012-11-14Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, ↵Rob Romano
updated tests & docs. Left authtoken.urls in place as example.