encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-31 07:57:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,720 Commits 16 Branches 134 Tags 128 MiB
3c57e08f62
Commit Graph

5720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
95a27a108d Merge pull request #2933 from cancan101/overide_method_action 
Set the action on a view when override_method regardless of its None-ness
 2015-05-27 09:10:58 +01:00
José Padilla
ad3bb05a87 Merge pull request #2971 from aschn/master 
Add drf-tracking to third-party-resources.md
 2015-05-26 21:37:29 -04:00
Anna Schneider
9903392053 Merge pull request #1 from aschn/aschn-patch-2968 
Add drf-tracking to third-party-resources.md
 2015-05-26 17:01:24 -07:00
Anna Schneider
6553e253f3 Add drf-tracking to third-party-resources.md 2015-05-26 16:58:08 -07:00
Tom Christie
eeef85373c Merge pull request #2962 from aericson/fix-dependency-of-mkdoc 
Update mkdocs version to 0.12.2
 2015-05-26 09:18:27 +01:00
Carlton Gibson
578c8de4c2 Merge pull request #2965 from tinchodipalma/patch-1 
Fix markdown link references in release notes
 2015-05-25 10:14:55 +02:00
Martin Di Palma
7449e29cf7 Links issues 
The following items had a wrong href value:

- Dont require pk strictly for related fields. (#2745, #2754)
- Restrict integer field to integers and strings. (#2835, #2836)
 2015-05-25 02:24:11 -03:00
Xavier Ordoquy
c6d94fb6d2 Merge pull request #2963 from aericson/add-cdrf-to-docs 
Add Classy Django REST Framework(cdrf.co) to Third Party Resources
 2015-05-22 22:47:32 +02:00
André Ericson
e6e5a27836 Add Classy Django REST Framework(cdrf.co) to Third Party Resources 2015-05-22 17:18:59 -03:00
André Ericson
021644b913 Update mkdocs version to 0.12.2 
The old version of mkdocs required 'Markdown>=2.3.1,<2.5' and
requirements-optionals.txt lists markdown==2.5.2 causing mkdocs
to fail.
 2015-05-22 16:39:49 -03:00
Tom Christie
010f2ee9bd Merge pull request #2952 from Ernest0x/patch-3 
Support basic authentication with custom user models that change username field
 2015-05-20 09:56:38 +01:00
Petros Moisiadis
192719eed0 Improve coding style 
On Tom's suggestion, improve coding style by using a single-line call to getattr() with a default value instead of a multi-line if/else clause.
 2015-05-19 20:00:19 +03:00
Petros Moisiadis
a96ebd74b1 Fix flake8 error 
Fix flake8 error
 2015-05-19 19:48:53 +03:00
Petros Moisiadis
c63ea01f4f Support User model in Django 1.4 that has not a USERNAME_FIELD attribute 
Support User model in Django 1.4 that has not a USERNAME_FIELD attribute.
 2015-05-19 19:05:50 +03:00
Petros Moisiadis
43b4ae752d Import get_user_model from compat module 
Import get_user_model from compat module to be compatible with older django versions (e.g. 1.4).
 2015-05-19 18:00:17 +03:00
Petros Moisiadis
a13075486d Compatibility code for getting user model 
Compatibility code for getting user model
 2015-05-19 17:57:27 +03:00
Petros Moisiadis
bb002262ac Support basic authentication with custom user models that change username field 
Support basic authentication with custom user models with a username field that is not named 'username'.
 2015-05-19 17:42:44 +03:00
Michał Hernas
e8c226c2db Fixed lint problems 2015-05-18 16:55:40 +02:00
Michał Hernas
069ea31cfb Added test ensuring DecimalField accepts 2E+2 as 200 and validates 
decimal place correctly.
 2015-05-18 16:42:24 +02:00
Omer Katz
67ff078388 Renamed the cached fields lists. 2015-05-17 09:54:33 +03:00
Tom Christie
e33fed70d6 Merge pull request #2940 from rapilabs/master 
Allow unexpected values for ChoiceField/MultipleChoiceField representations
 2015-05-15 16:54:55 +01:00
David Sanders
b7edd46313 Use simpler dict.get() rather than try/except 2015-05-16 01:01:27 +10:00
tony
0906bf2c08 fix empty and_query 2015-05-15 16:44:12 +03:00
tony
de95598a1e removed using view.model.objects 2015-05-15 13:46:56 +03:00
David Sanders
8e84a9f6d0 Allow invalid outputs to pass through to_representation() for ChoiceField & MultipleChoiceField 2015-05-15 18:59:10 +10:00
tony
c47ec60ea2 no need to do distinct on every loop cycle & add analogue of distinct for oracle users 2015-05-14 17:04:22 +03:00
tony
7813d2fb35 fix DISTINCT for Oracle databases 2015-05-14 13:57:36 +03:00
Xavier Ordoquy
6add1acc4e Add a few cosmetic changes to the release notes. 2015-05-14 11:18:18 +02:00
Xavier Ordoquy
475e431055 Fix the broken links. 2015-05-14 11:15:26 +02:00
Xavier Ordoquy
1a8c0b4bfc Merge pull request #2930 from linovia/release/3.1.2 
Release 3.1.2
 2015-05-14 10:57:33 +02:00
Alex Rothberg
a804d0bd75 set the action when override_method regardless of its None-ness 2015-05-13 22:53:32 -04:00
Xavier Ordoquy
47d36f150b Add last minute PR. 2015-05-13 18:24:06 +02:00
Tom Christie
ea1145c5aa Merge pull request #2905 from ticosax/django-object-perm-get_queryset 
Allow DjangoObjectPermissions to use views that define get_queryset
 2015-05-13 13:39:59 +01:00
Nicolas Delaby
031ac2a292 Allow DjangoObjectPermissions to use views that define get_queryset 2015-05-13 14:26:44 +02:00
Xavier Ordoquy
fb4ba3ad3c Bump version to 3.1.2 2015-05-13 09:44:15 +02:00
Xavier Ordoquy
5c8df2c56b Release notes for 3.1.2 2015-05-13 09:44:04 +02:00
Marco Vellinga
478b1dbd06 Use get_queryset() for RelatedField choices property instead of self.queryset.all() 2015-05-11 15:28:10 +02:00
José Padilla
21cb808569 Merge pull request #2921 from donkirkby/patch-1 
minor grammar fix
 2015-05-10 18:44:21 -04:00
Omer Katz
1ee3173583 Cache fields list for to_internal_value and to_representation. 2015-05-09 14:37:49 +03:00
Don Kirkby
0b8dd906cf minor grammar fix 2015-05-08 15:28:30 -07:00
Kevin Brown
35efbe41ab Merge pull request #2917 from respondcreate/master 
Adding django-versatileimagefield to DRF 3rd party docs
 2015-05-07 16:14:26 -04:00
Jonathan Ellenberger
44317b4581 Adding django-versatileimagefield to DRF 3rd party docs 
Closes WGBH/django-versatileimagefield#12
 2015-05-07 14:23:24 -04:00
José Padilla
3a96164501 Merge pull request #2914 from trollknurr/master 
Added link to djangorestframework-word-filter package
 2015-05-06 12:11:04 -04:00
tony
b0b26d6b68 Added link to djangorestframework-word-filter package 2015-05-06 13:40:01 +03:00
José Padilla
a7d5e32193 Merge pull request #2909 from sheppard/update-wq 
update info about wq.db.rest router
 2015-05-05 16:09:18 -04:00
S. Andrew Sheppard
e9b6b47872 update info about wq.db.rest router 2015-05-05 13:38:14 -05:00
Tom Christie
859c20804c Merge pull request #2907 from mrunge/master 
Separate LICENSE and README to two files.
 2015-05-05 14:46:49 +01:00
Matthias Runge
04084c96a0 Separate LICENSE and README to two files. 2015-05-05 14:48:30 +02:00
Tom Christie
2e85b4ec3c Merge pull request #2890 from radyz/fixed-doc-for-get-paginated-response-method 
Document correct method usage for get_paginated_response
 2015-05-05 09:15:28 +01:00
Tom Christie
4db35a2380 Merge pull request #2902 from soloradish/master 
Delete imported but not used method
 2015-05-05 09:12:15 +01:00