encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 19:43:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,578 Commits 18 Branches 132 Tags 105 MiB
c80796ec04
Commit Graph

5578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
a90dbe3bd9 Merge pull request #2724 from delinhabit/namespaced-versioning-non-api-reversal 
Handle reversal of non-API view_name in HyperLinkedRelatedField
 2015-03-23 11:35:21 +00:00
Tom Christie
f7cd7a1c1f Latest translation strings 2015-03-23 11:32:28 +00:00
Tom Christie
dbb6943298 Update release notes 2015-03-23 11:24:29 +00:00
Tom Christie
e73ddddc3a Merge pull request #2726 from linovia/release/3.1.1 
Release notes for 3.1.1 and version bump.
 2015-03-23 11:20:23 +00:00
Tom Christie
7872d0acbf Escape tab switching cookie 2015-03-23 11:20:09 +00:00
Tobias Preuss
49c04d7218 Fix typo. 2015-03-23 11:20:08 +01:00
Tom Christie
166801063d Merge pull request #2743 from maurodoglio/serializer_class-html-renderer 
Use `serializer_class` for browsable API display, even on plain APIView.
 2015-03-23 09:43:39 +00:00
Andrea Grandi
a0049dd489 Add a blank line to make lint happier 2015-03-22 23:21:09 +00:00
Devon Bleibtrey
8a58b1a380 Added ability to define backend identification attribute 2015-03-22 13:50:05 -04:00
Andrea Grandi
1d883e0825 Add two more tests for IPAddressField, checking the IPv4 and IPv6 protocols separately 2015-03-22 16:46:16 +00:00
mdoglio
77c44d8c63 Make BrowsableAPIRenderer use serializer_class when present 2015-03-22 14:36:30 +00:00
mdoglio
d0126b7e31 Set serializer_class on ObtainAuthToken view 2015-03-22 12:35:56 +00:00
Tom Christie
c9618cc0f3 Merge pull request #2741 from maurodoglio/hide-authtoken-field 
AuthTokenSerializer - properly render password field
 2015-03-22 12:18:37 +00:00
mdoglio
fde02ae6eb AuthTokenSerializer - properly render password field 2015-03-22 12:13:28 +00:00
Tom Christie
22569e8202 Merge pull request #2733 from pquentin/patch-reverse 
Put the needed import in one example
 2015-03-20 14:46:06 +00:00
Quentin Pradet
a5506610ad Put the needed import in one example 2015-03-20 15:17:49 +01:00
Ion Scerbatiuc
fac2785341 Handling the fallback in reverse 2015-03-19 16:12:28 -07:00
Xavier Ordoquy
164be174ea Release notes for 3.1.1 and version bump. 2015-03-19 23:29:10 +01:00
Ion Scerbatiuc
90280a3437 Handle reversal of non-API view_name in HyperLinkedRelatedField 2015-03-19 14:16:45 -07:00
José Padilla
e34e0536b1 Merge pull request #2707 from ajyong/patch-1 
Fix typo in versioning docs
 2015-03-17 13:58:35 -04:00
Aaron Yong
000db8df18 Fix typo in versioning docs 2015-03-17 11:36:02 -06:00
Tom Christie
74506ba8ed Merge pull request #2705 from diwu1989/patch-1 
use SAFE_METHODS and make tuple
 2015-03-17 09:04:44 +00:00
Di Wu
48e1f151c5 use SAFE_METHODS and make tuple 2015-03-16 22:13:07 -07:00
Tom Christie
2e55d15d4d Merge pull request #2703 from kylepjohnson/master 
Add necessary imports to final urls.py example
 2015-03-16 15:33:00 +00:00
Tom Christie
53bb4832d3 Merge pull request #2702 from rubendura/master 
Updates ducumentation DEFAULT_PAGE_SIZE left over after #2655
 2015-03-16 15:18:43 +00:00
Kyle P. Johnson
d655a423fb Add necessary imports to final urls.py example 2015-03-16 11:17:02 -04:00
Rubén Durá Tarí
ac44bae90d Updates ducumentation DEFAULT_PAGE_SIZE left over after #2655 2015-03-16 14:53:26 +00:00
Tom Christie
2148f32007 Merge pull request #2700 from tomchristie/do-not-paginate-if-page-size-none 
Do not paginate if PAGE_SIZE=None
 2015-03-16 12:15:50 +00:00
Tom Christie
992971d648 Merge pull request #2631 from Ins1ne/feature/issue-2559 
Allow blank/null on radio.html choices
 2015-03-16 12:11:33 +00:00
Tom Christie
5cd0714dca Do not paginate if PAGE_SIZE=None 2015-03-16 12:05:31 +00:00
Tom Christie
4cd49d5de3 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-03-16 11:57:42 +00:00
Tom Christie
c573e7b4a8 Latest translation strings 2015-03-16 11:57:28 +00:00
Tom Christie
1c0db6dda8 Merge pull request #2697 from jpadilla/tests 
Simplify test settings
 2015-03-16 09:18:08 +00:00
José Padilla
76ede5beda Simplify test settings 2015-03-14 15:57:22 -04:00
Ion Scerbatiuc
022c4d540b Refactored DecimalField to allow easier subclassing 2015-03-14 07:16:17 -07:00
Tom Christie
b41808b79a Merge pull request #2691 from mochawich/patch-1 
fixed missing anchor closing tag
 2015-03-13 16:14:12 +00:00
mochawich
2266fec99d fixed missing anchor closing tag 
when next_url is none, big part of page html will be rendered under the <a href='#'> as it does not have a closing tag.
 2015-03-13 17:03:51 +01:00
Xavier Ordoquy
cc64e30f55 Merge pull request #2685 from rbarrois/rbarrois/fix_lookup_url_kwarg 
Fix lookup_url_kwarg handling in viewsets (Fixes #2591).
 2015-03-13 07:49:14 +01:00
Raphaël Barrois
8d0dbc8092 Fix lookup_url_kwarg handling in viewsets. 
The ``lookup_url_kwarg`` is intended to set the name of a field in the
URL regexps when using custom ``lookup_field``, but the routers ignore
it altogether.
 2015-03-13 01:07:20 +01:00
Xavier Ordoquy
a02098b855 Fix the link to the old doc (#2681). 2015-03-13 00:15:53 +01:00
José Padilla
36e30c8f91 Merge pull request #2678 from vikingco/fix/ugettext-in-pagination 
Fixed problem with imporing rest_framework.views in apps.py
 2015-03-12 11:52:43 -04:00
Dirk Moors
6c1d0d7ed0 Fixed problem with imporing rest_framework.views in apps.py 2015-03-12 16:36:26 +01:00
José Padilla
ff35b971d3 Merge pull request #2671 from esmail/patch-2 
Fix example of explicit format URL (for real).
 2015-03-11 12:03:12 -04:00
Esmail
2484dbf4e1 Fix example of explicit format URL (for real). 
Do what I meant to do in #2670:

The link is displayed in the tutorial as "http://example.com/api/items/4.json" but the hyperlink itself and what the example code actually works with are (in my opinion, less pretty) URLs like "http://example.com/api/items/4/.json".
 2015-03-11 12:00:19 -04:00
Xavier Ordoquy
42ee8e147c Merge pull request #2668 from Maplecroft/doc_fixes 
Fix for minor documentation typo
 2015-03-11 12:29:54 +01:00
James Rutherford
7854c939dd Fixed import statement in API docs 2015-03-11 10:44:42 +00:00
James Rutherford
4a2d27975a Merge pull request #1 from tomchristie/master 
Merge in from upstream
 2015-03-11 10:38:03 +00:00
José Padilla
dc56e5a0f4 Merge pull request #2666 from balsdorf/patch-1 
Changed incorrect class name in pagination docs
 2015-03-10 19:01:50 -04:00
Bryan Alsdorf
69b6e26f06 Changed incorrect class name 2015-03-10 17:30:41 -05:00
Xavier Ordoquy
3e44f788b1 Fixed a typo in the documentation's link. 2015-03-09 17:28:00 +01:00