encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 21:44:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,353 Commits 18 Branches 132 Tags 105 MiB
c8915c0716
Commit Graph

6353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ordoquy
37be7870ca Merge pull request #2856 from zmmachar/patch-1 
Update renderers.md
 2015-04-22 09:24:00 +02:00
zmmachar
237c2ebc26 Update renderers.md 
jsonp renderer not in the yaml package
 2015-04-21 18:09:55 -07:00
Tom Christie
0ca1145456 Merge pull request #2853 from ryangallen/master 
Set IntegerField class variable for compiled decimal regex, comment for ...
 2015-04-21 16:00:37 +01:00
Ryan Allen
32acc4a72b Set IntegerField class variable for compiled decimal regex, comment for purpose 2015-04-21 10:52:52 -04:00
Tom Christie
605369e2b4 Merge pull request #2807 from iorlas/patch-2 
Now it is possible to display viewset w/o paginator
 2015-04-21 15:07:11 +01:00
Xavier Ordoquy
86e7702f11 Merge pull request #2845 from Siecje/docs 
Specifying module for CurrentUserDefault()
 2015-04-21 10:51:00 +02:00
Cody Scott
cbf17a5ffe Specifying module for CurrentUserDefault() 
Prevents having to lookup the import
 2015-04-20 19:14:58 -04:00
Kevin Brown
5cc0a3c2a8 Merge pull request #2836 from ryangallen/master 
only allow integer field to accept integers and strings, fixes #2835
 2015-04-20 18:10:40 -04:00
frnc
601cbf18d4 Update 5-relationships-and-hyperlinked-apis.md 
Following  [@jpadilla](https://github.com/jpadilla)'s suggestion in issue [#2837](https://github.com/tomchristie/django-rest-framework/issues/2837), I am proposing a little addition in "Creating an endpoint for the root of our API" section in order to make it clear that the `user-list` and `snippet-list` names will be declared later in `snippets/urls.py`. Missing this clarification might lead a beginner (like me) to think that the names are somehow assigned by rest_framework under the hood and to try the code too early, getting stuck in the following errors.
 2015-04-20 17:56:04 +02:00
Ryan Allen
1f10a39d31 Match IntegerField validation with Django's, preventing decimal values being stored as ints, fixes #2835. 
Match IntegerField validation with Django IntegerField, prevents decimal values being stored as ints, fixes #2835
 On branch master
 2015-04-20 11:03:05 -04:00
Adam Parsons
72230a913e Removed color from default 2015-04-18 16:52:20 -05:00
Adam Parsons
324ccc3664 Moved breadcrumb color to bootstrap-tweaks 
Moved to color associated with the breadcrumb to the tweaks style sheet.
 2015-04-18 16:50:32 -05:00
Rense VanderHoek
5b7404cb9c Merge remote-tracking branch 'upstream/master' 
* upstream/master: (54 commits)
  docs/renderers: `StaticHTMLRenderer` instead of `TemplateHTMLRenderer`
  Django 1.8 is no longer in beta
  Removed deprecated '.model' attribute check
  Update example of nested data
  Update serializers documentation (removed feature)
  more sp fixes
  Fix typo.
  Workaround for bug in pip
  Test against Django's master branch
  Django 1.8 released
  Should use "ordering" in model Meta, not order_by
  `query_params` in favor of `QUERY_PARAMS`
  Fixed docstring typo
  Reference typos in fields.md
  Use default reason phrases from HTTP standard.
  Metadata should detect null boolean field type.
  Fix older release notes link
  Try to resolve pep8 versioning clash.
  Swapping to hassattr logic for pk attribute references in relations
  Added enhancement for pk reference in many=True relations
  ...
 2015-04-18 13:44:31 +02:00
Tom Christie
ecb37f518e Merge pull request #2818 from maryokhin/master 
Don't check for deprecated '.model' attribute in permissions
 2015-04-17 16:15:27 +01:00
José Padilla
c6657da5f4 Merge pull request #2831 from teddywing/docs-renderers-use-appropriate-renderer-class-name 
docs/renderers: `StaticHTMLRenderer` instead of `TemplateHTMLRenderer`
 2015-04-16 16:20:43 -04:00
Teddy Wing
0f5082d9b8 docs/renderers: StaticHTMLRenderer instead of TemplateHTMLRenderer 
The `StaticHTMLRenderer` section referred to `TemplateHTMLRenderer`
instead of `StaticHTMLRenderer`.
 2015-04-16 15:47:53 -04:00
Kevin Brown
ec5c3aa5e7 Merge pull request #2823 from jpadilla/master 
Django 1.8 is no longer in beta
 2015-04-14 16:52:40 -04:00
José Padilla
3abbeadfaf Django 1.8 is no longer in beta 2015-04-14 11:32:15 -04:00
Tymur Maryokhin
1ddfef1212 Removed deprecated '.model' attribute check 2015-04-12 17:12:01 +02:00
Thomas Stephenson
236b731072 Add 'format' argument to UUIDField 
To allow serializations to control the representation format of a
UUID value
 2015-04-12 22:07:25 +10:00
José Padilla
970bfe16ec Merge pull request #2810 from robhudson/patch-1 
Update example of nested data
 2015-04-09 13:25:01 -04:00
Rob Hudson
e6308155dd Update example of nested data 2015-04-08 21:38:02 -07:00
Adam Parsons
77460d4bca Moved ul.breadcrumb margin to bootstrap-tweaks.css 
When importing other bootstrap themes from sites like bootswatch, the
margin in default.css persists and adds a 70px margin below the header.
This change will remove that margin when users choose to use a different
bootstrap theme.
 2015-04-08 20:10:33 -05:00
iorlas
548ac9a65e Now it is possible to display viewset w/o paginator 
Since pagination is now included in every generic viewset, we should have ability to disable it and we have it: paginator=None or pagination_class=None. But this piece of code relies on existence of property instead of its value.
 2015-04-08 20:32:02 +03:00
Xavier Ordoquy
311cad64c9 Merge pull request #2805 from pstiasny/patch-1 
Update serializers documentation (removed feature)
 2015-04-08 13:58:15 +02:00
Paweł Stiasny
22e8357a4b Update serializers documentation (removed feature) 
It seems that allow_add_remove was removed from 3.x, yet the docs still mention it. Updating to avoid confusion.
 2015-04-08 13:53:49 +02:00
Xavier Ordoquy
3f0f977b96 Merge pull request #2803 from asparagui/sp_fixes 
more sp fixes
 2015-04-08 08:32:21 +02:00
Brett Koonce
d8a19f79ab more sp fixes 2015-04-07 22:06:25 -07:00
José Padilla
80d8a1ff8c Merge pull request #2800 from olmar/patch-2 
Fix typo.
 2015-04-07 12:48:11 -04:00
Oleg Marshev
b0dd1fffbf Fix typo. 2015-04-07 19:40:23 +03:00
Xavier Ordoquy
0c7f36ecd8 Merge pull request #2795 from jpadilla/test-djangomaster 
Test against Django's master branch
 2015-04-07 08:22:01 +02:00
Igor Zygin
2d5b4f4cc9 Depth should reduce 
Depth should reduce
 2015-04-06 10:13:25 +06:00
José Padilla
9844f652a9 Workaround for bug in pip 2015-04-04 22:18:52 -04:00
José Padilla
7228a0df75 Test against Django's master branch 2015-04-04 22:07:11 -04:00
José Padilla
2e6d39dbae Merge pull request #2754 from bleib1dj/enhancement_dont_require_pk_strictly_related 
Enhancement dont require pk strictly related #2745
 2015-04-04 22:01:06 -04:00
José Padilla
6333e48188 Merge pull request #2753 from johnjohndoe/patch-1 
Fix typo.
 2015-04-03 17:30:52 -04:00
Andrea Grandi
d6effbf779 Remove unpack_ipv4 parameter 2015-04-02 19:40:17 +01:00
Xavier Ordoquy
73e46d9a7f Merge pull request #2786 from maryokhin/patch-2 
Update tox & Travis with Django 1.8 release
 2015-04-02 11:17:16 +02:00
Tymur Maryokhin
596093d494 Django 1.8 released 2015-04-02 10:50:53 +02:00
Tom Christie
5cf8230ba1 Merge pull request #2777 from jpadilla/docs-query-params 
`query_params` in favor of `QUERY_PARAMS`
 2015-04-01 09:24:38 -04:00
Kevin Brown
ad8de232c2 Merge pull request #2782 from caffodian/master 
Should use "ordering" in model Meta, not order_by in Serializer Relations example [documentation]
 2015-03-31 20:54:51 -04:00
Alex Tsai
fbd8c18abd Should use "ordering" in model Meta, not order_by 2015-03-31 17:30:04 -07:00
José Padilla
911da8a2b9 query_params in favor of QUERY_PARAMS 2015-03-29 17:04:23 -04:00
Kevin Brown
ba951f3339 Merge pull request #2775 from exonian/patch-1 
Fixed docstring typo
 2015-03-27 18:09:36 -04:00
Michael Blatherwick
56ec7b152e Fixed docstring typo 2015-03-27 18:00:19 +00:00
Andrea Grandi
466575bee6 Lowercase the input 2015-03-26 18:14:53 +00:00
Udi Oron
b95ef25cbb Wrong error message on bad field lookup 2015-03-26 20:13:35 +02:00
José Padilla
5f3d09a052 Merge pull request #2767 from ckaalund/patch-1 
Reference typos in fields.md
 2015-03-26 10:59:07 -04:00
Christoffer
6cb6b02811 Reference typos in fields.md 2015-03-26 15:51:48 +01:00
Carlton Gibson
aa131ae258 Merge pull request #2764 from jpadilla/2763 
Use default reason phrases from HTTP standard. Fixes #2763
 2015-03-25 21:08:03 +01:00