encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 13:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,948 Commits 18 Branches 132 Tags 105 MiB
0198bce34f
Commit Graph

5948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Padilla
5d4bb0ef22 Merge pull request #3038 from jpadilla/dropdown 
Set dynamic maximum height for dropdown widgets
 2015-06-22 09:13:41 -04:00
Markus Korn
aa1ad4fb64 test_requests TestSecure: skip tests for django versions where the secure 
argument is not available
 2015-06-22 14:28:09 +02:00
Markus Korn
06c61fc511 compat: only add compat implementation of RequestFactory.generic() if not 
provided by django
 2015-06-22 14:05:56 +02:00
Markus Korn
d86e494e86 test_quests: added TestSecure for the emulation of secure connections in test cases 2015-06-22 14:04:46 +02:00
Omer Katz
1701ddae35 Fixed formatting of _readable_fields list comprehension to match the formatting of the _writable_fields list comprehension. 2015-06-20 08:51:03 +03:00
Brian Grohe
51cda112f5 Simplified if statement to one line solution 
Based on feedback on the pull request, changed solution to
be simpler for issue 3042
 2015-06-19 09:21:35 -04:00
Xavier Ordoquy
8c5fc2a94b Merge pull request #2732 from pquentin/patch-versioning 
Document per-view versioning settings
 2015-06-19 12:56:24 +02:00
Xavier Ordoquy
7cb618a09f Merge pull request #3047 from jpadilla/html-cleanup 
Consistent 2 space tabbing and formatting
 2015-06-18 19:29:38 +02:00
José Padilla
5e917789ec Consistent 2 space tabbing and formatting 2015-06-18 09:00:05 -04:00
Brian Grohe
d24990ece2 Fixed many=False issue in related fields 
Added check to pop many from kwargs before passing to __init__
Fixed my lint issue from the previous commit
 2015-06-17 13:48:34 -04:00
Brian Grohe
79736e516a Added failing test case 
Adding failing test case when many=false is explicitly defined

https://github.com/tomchristie/django-rest-framework/issues/3042
 2015-06-17 13:18:50 -04:00
Jannon Frank
2c415d7e03 models.TextFields get mapped to serializers.CharField too 2015-06-16 14:05:19 -07:00
Xavier Ordoquy
e368986fcf Merge pull request #3043 from accordeiro/accordeiro/docs-typo-fix 
Fixed minor typo on viewsets.md
 2015-06-16 22:49:41 +02:00
Xavier Ordoquy
139ba7adeb Merge pull request #3006 from osantana/master 
Handle invalid characters in "Authorization: token ..." headers
 2015-06-16 22:40:15 +02:00
Alexandre Cordeiro
deb2c9eb87 Fixed minor typo on viewsets.md 
I'm not sure how the contribution policy for the docs is, but I thought it'd be faster to issue a pull request than reaching out to you guys/creating an issue for something so simple. Hope it's not a problem :)
 2015-06-16 17:36:11 -03:00
Xavier Ordoquy
5524339e0e Merge pull request #3037 from jpadilla/master 
Fix versioning urls
 2015-06-16 21:34:31 +02:00
José Padilla
33a08928d7 Set dynamic maximum height for dropdown widgets 2015-06-15 21:46:08 -04:00
José Padilla
0be6d87fac Fix versioning urls 2015-06-15 16:51:37 -04:00
José Padilla
7f0acbd5a5 Merge pull request #3026 from linovia/feature/format_suffix_patterns_and_trailing_slash 
`format_suffix_patterns` is applied before the trailing slash.
 2015-06-15 16:38:12 -04:00
Xavier Ordoquy
be9327ad3a Merge pull request #3025 from linovia/documentation 
Replace the former `get_filter_backends` by `filter_queryset`.
 2015-06-15 22:28:41 +02:00
Xavier Ordoquy
49404f6977 Merge pull request #2789 from ovangle/primary_key_serialization 
Primary key serialization
 2015-06-15 22:23:01 +02:00
Thomas Stephenson
a1e0bae9da Custom serialization of PrimaryKeyRelatedField values 
Adds a 'pk_field' parameter which can be used to proxy serialization and
deserialization of arbitrary primary key values.
 2015-06-15 04:43:49 +10:00
Kevin Brown
b0889446a5 Merge pull request #3027 from linovia/feature/url_patterns_removal 
Remove `django.conf.urls.pattern`
 2015-06-11 16:40:40 -04:00
Xavier Ordoquy
bfd7219352 Define the urlpatterns as a list of `url().... 2015-06-11 01:01:47 +02:00
Xavier Ordoquy
9f1805f2f0 Removed unused imports. 2015-06-11 00:51:33 +02:00
Xavier Ordoquy
1e51230f1b Remove django.conf.urls.pattern as it'll be removed in Django 2.0 2015-06-11 00:45:23 +02:00
Xavier Ordoquy
fb2c09f6ae Remove unused patterns import. 2015-06-11 00:36:37 +02:00
Xavier Ordoquy
e7e5946c2e format_suffix_patterns is applied before the trailing slash. 2015-06-11 00:32:05 +02:00
Xavier Ordoquy
c80796ec04 Mention filter_queryset as an alternative to former get_filter_backends 2015-06-10 23:32:52 +02:00
Xavier Ordoquy
2749b12eaf Merge pull request #3017 from nmandery/feature/set-filter_backends-in-api-docs 
Set the filter_backends class variable in the DjangoFilterBackend docs
 2015-06-09 10:29:34 +02:00
Xavier Ordoquy
b06f944d2d Merge pull request #3016 from hellysmile/non_atomic_requests 
Fix set_rollback on @transaction.non_atomic_requests.
 2015-06-08 23:43:50 +02:00
Xavier Ordoquy
ca0a7ee1de Revert "Bump the django-guardian & django-filter to latests versions." 
This reverts commit e095b91f60.
 2015-06-08 21:48:05 +02:00
Xavier Ordoquy
e095b91f60 Bump the django-guardian & django-filter to latests versions. 2015-06-08 21:42:42 +02:00
hellysmile
cbfce93129 Fitx TestCase due Django interals. 2015-06-08 18:15:31 +03:00
Nico Mandery
325789db95 set the filter_backends class variable in the DjangoFilterBackend documentation for clearness 2015-06-08 15:18:30 +02:00
hellysmile
b015ae99e6 Inline @transaction.non_atomic_requests for Django<1.6. 2015-06-08 07:39:08 +03:00
hellysmile
c292b3d132 Fix set_rollback on @transaction.non_atomic_requests. 2015-06-08 07:10:57 +03:00
Tom Christie
6651432d59 Merge pull request #3015 from strixcuriosus/limit-offset-pagination-link-urls 
Include correct limits in LimitOffsetPagination link urls
 2015-06-05 20:37:04 +01:00
Ash Hoover
35c28a2a71 Include correct limits in LimitOffsetPagination link urls 2015-06-05 08:56:33 -07:00
malinich
4a2bad03c5 outdated method 'get_filter_backends' has been deleted from the documentation 2015-06-05 15:40:13 +03:00
Jannon Frank
b0752217ae only include 'allow_blank' on CharField 2015-06-05 02:21:13 -07:00
Tom Christie
bde05bfd3e Merge pull request #3010 from jaredpetersen/master 
Remove reference to Bootstrap Customizer in browsable-api.md
 2015-06-05 08:55:10 +01:00
Jared Petersen
2b2fbbd299 Update browsable-api.md 
The Bootstrap Customizer has been discontinued and is no longer available (http://getbootstrap.com/2.3.2/customize.html), so I removed the reference to it in the page.
 2015-06-04 21:28:21 -07:00
Xavier Ordoquy
8935db1be9 Merge pull request #3003 from linovia/release/3.1.3 
Release 3.1.3
 2015-06-04 15:04:55 +01:00
Xavier Ordoquy
9a20609223 Merge pull request #3004 from linovia/translations/3.1.3 
Translations updated for 3.1.3
 2015-06-04 14:59:32 +01:00
Xavier Ordoquy
886220cb70 Last minute pull request 2015-06-04 14:56:00 +01:00
Tom Christie
a3d6601e09 Merge pull request #3008 from linovia/feature/ipaddress-fix 
`IPAddressField` improvements
 2015-06-04 14:54:50 +01:00
Xavier Ordoquy
757e45acee Adding the last minute PR. 2015-06-04 14:37:01 +01:00
Tom Christie
e8cc948f6b Merge pull request #2695 from delinhabit/refactor-decimalfield 
[enhancement] Refactored DecimalField to allow easier subclassing
 2015-06-04 14:26:28 +01:00
Xavier Ordoquy
dee5fb5647 Merge remote-tracking branch 'reference/master' into feature/ipaddress-fix 
Conflicts:
	docs/api-guide/fields.md
 2015-06-04 14:21:33 +01:00