encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-14 13:46:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,474 Commits 18 Branches 132 Tags 104 MiB
f48ccad581
Commit Graph

6474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
S. Andrew Sheppard
ff29fdd875 don't import authtoken model until needed 2015-12-30 15:44:19 -06:00
Tom Christie
af0ea8ef51 Merge pull request #3771 from robromano/master 
Add HTTP status code 451 to status.py
 2015-12-29 09:59:48 +00:00
Leonid Shvechikov
ff0292a757 Fix update model example in html-and-forms.md 2015-12-27 17:14:33 +03:00
Kevin Brown
d797389cf7 Fixed broken test for Django < 1.9 
This test was incorrectly checking that there were no validators set in
older versions of Django, even though it should have been checking for
the two validators that were set up on the model field level.

The originally regression test that this fixes was added in
7d79cf35b7
when fixing an issue with the `DecimalValidator`.
 2015-12-24 18:17:58 -05:00
Kevin Brown
87605e1e39 Don't filter out the DecimalValidator if it is not supported 
Previously, all validators set on a DecimalField in Django would be
stripped when converted to a Django REST framework field. This was
because any validator that was an instance of `DecimalValidator` would
be removed, and when `DecimalValidator` wasn't supported (so it was
`None`), all validators would be removed.

This fixes the issue by only removing the `DecimalValidator` instances
if the `DecimalValidator` is supported.
 2015-12-24 14:10:48 -05:00
Kevin Brown
9bab640b0a Added tests for min_value and max_value on a DecimalField 
This adds tests for a regression where the `min_value` and `max_value`
arguments are not being set for a DRF `DecimalField` even though the
corresponding `MinValueValidator` and `MaxValueValidator` is being set
on the model fields.

Note that this only appears to be a regression for Django < 1.9, as
these regression tests pass on newer versions of Django.
 2015-12-24 14:00:49 -05:00
Robert Romano
c8915c0716 Change tab to spaces 2015-12-23 12:58:14 -08:00
Robert Romano
5fc938cbd1 The Internet Engineering Task Force approved the new HTTP status code 451. Adding to status.py and docs appropriately. 2015-12-23 12:54:17 -08:00
Tom Christie
2d27d9a10a Merge pull request #3769 from mlissner/master 
Fixes #3756, adding the name to the HTML title, if it exists.
 2015-12-23 16:58:29 +00:00
Michael Lissner
f15026be10 Fixes #3756, adding the name to the HTML title, if it exists. 2015-12-22 10:31:18 -08:00
José Padilla
503687d868 Merge pull request #3765 from linovia/feature/fix_guardian_for_dj_19 
Update the Django-guardian version for Django 1.9
 2015-12-21 16:59:03 -04:00
Xavier Ordoquy
c5003e8dc1 Update the Django-guardian version for Django 1.9 2015-12-21 18:02:24 +01:00
Tom Christie
ce77ed81df Merge pull request #3762 from ekonstantinidis/add-drf-docs 
Add DRF docs to "Documenting your API"
 2015-12-21 16:47:44 +00:00
Emmanouil Konstantinidis
1925ec7d33 Both are highly recommended 2015-12-21 13:59:05 +00:00
Emmanouil Konstantinidis
4204557bc5 Remove title and hr 2015-12-21 13:55:11 +00:00
Emmanouil Konstantinidis
958290724c Rest is "REST" 2015-12-21 13:47:04 +00:00
Emmanouil Konstantinidis
a83cb1d2f3 Minor changes 2015-12-21 13:45:11 +00:00
Emmanouil Konstantinidis
1aedaafba4 Add DRF docs to the list 2015-12-21 13:40:23 +00:00
Xavier Ordoquy
5ddfb25fbc Merge pull request #3758 from toolness/patch-1 
Update bootstrap version in browsable-api.md
 2015-12-19 17:17:06 +01:00
Atul Varma
66de876dee Update bootstrap version in browsable-api.md 2015-12-19 10:34:39 -05:00
Tom Christie
18cdfcd712 Merge pull request #3731 from mjparker777/master 
Issue 3726 DateTimeField not handling empty values
 2015-12-18 11:27:12 +00:00
Tom Christie
61e7f7b0cc Merge pull request #3715 from Cheglader/settings_errors 
Raise error when setting a removed rest_framework setting for #3644
 2015-12-18 11:19:06 +00:00
mjparker777
d9c360845d changed datefield to match code layout of datetime and time changes 2015-12-17 12:21:44 -07:00
mjparker777
f3d5e1482b Merge remote-tracking branch 'upstream/master' 2015-12-17 12:20:47 -07:00
Tom Christie
6eb3a42993 Merge pull request #3753 from tomlinford/master 
Subclass AutoFilterSet from self.default_filter_set
 2015-12-17 14:10:13 +00:00
Luis San Pablo
c389aeb051 Lint import ordring 2015-12-16 18:46:23 -06:00
Luis San Pablo
62e2a9706f Fixed import order settings 2015-12-16 18:37:50 -06:00
Luis San Pablo
dab6bf4b1a Changed error to warning message 2015-12-16 18:35:02 -06:00
Tom Linford
c78980771d AutoFilterSet should subclass from self.default_filter_set 2015-12-16 15:36:07 -08:00
José Padilla
034e26ea31 Merge pull request #3748 from DanLipsitt/patch-1 
docstring typo fix: DateAndFiles -> DataAndFiles
 2015-12-16 15:05:59 -04:00
Dan Lipsitt
fb94be18be docstring typo fix: DateAndFiles -> DataAndFiles 2015-12-16 10:42:10 -08:00
Xavier Ordoquy
00ead782d4 Merge pull request #3747 from pbaehr/master 
Move urls.py changes down and add necessary import
 2015-12-16 18:22:26 +01:00
Tom Christie
26f948c836 Merge pull request #3745 from linovia/feature/py35_support 
Fix tox build against python 3.5 by upgrading pytest.
 2015-12-16 12:48:12 +00:00
Xavier Ordoquy
a4ce897d28 Display py.test internal warnings 2015-12-16 13:27:40 +01:00
Xavier Ordoquy
aab7da4891 Updated py.test and pytest-django to test against python 3.5. 2015-12-16 13:08:37 +01:00
Peter Baehr
44ae037e81 Move urls.py changes down and add necessary import 
The previous location of editting urls.py did not allow migrations to be created and the default import needs to be modified
 2015-12-15 21:17:52 -05:00
Xavier Ordoquy
e3274af0ef Merge pull request #3741 from tyrelsouza/master 
Some minor typos and grammar changes.
 2015-12-15 18:29:12 +01:00
Tyrel Souza
8c0d736f23 Also fix usecases to use cases 2015-12-15 10:28:23 -05:00
Tyrel Souza
ffc10edd7e Fix minor typo on Pagination documentation 2015-12-15 10:24:49 -05:00
Xavier Ordoquy
3a950f53b0 Merge pull request #3739 from nypisces/master 
Fix transifex config for Django
 2015-12-15 09:22:42 +01:00
NY
613e0d41ac Update config 2015-12-15 15:22:19 +08:00
NY
c45fdee2ab Fix transfix config for Django 2015-12-15 15:22:03 +08:00
Xavier Ordoquy
552707381e Merge pull request #3733 from linovia/version/3.3.2 
Version 3.3.2
 2015-12-14 13:47:31 +01:00
Xavier Ordoquy
ef8bde2d42 Bump version to 3.3.2 2015-12-14 07:33:17 +01:00
Xavier Ordoquy
5224feded4 Update the release date. 2015-12-14 07:32:50 +01:00
Xavier Ordoquy
485c297a04 Translations update. 2015-12-14 07:31:38 +01:00
Xavier Ordoquy
bf18c9f6e3 3.3.2 release notes. 2015-12-14 07:22:30 +01:00
mjparker777
decc5fa901 Merge remote-tracking branch 'upstream/master' 2015-12-13 17:51:06 -07:00
mjparker777
fc08236ab8 updated timefield also 2015-12-13 16:09:56 -07:00
mjparker777
81775dfbae added missing comma 2015-12-13 12:27:08 -07:00