encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-16 14:47:02 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,856 Commits 18 Branches 132 Tags 105 MiB
2084555fbe
Commit Graph

7856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mjparker777
bf60c08010 Issue 3726 DateTimeField not handling empty values 2015-12-13 12:21:13 -07:00
José Padilla
df071d5555 Merge pull request #3723 from linovia/bug/authtoken_versionning_compat 
Add extra args/kwargs to authtoken's views (#3718)
 2015-12-13 14:53:13 -04:00
Xavier Ordoquy
dcaff71217 Merge pull request #3728 from karthik-suresh/Fixes-Issue3727 
Import parser added to docs in API guide
 2015-12-12 22:19:13 +01:00
Karthik Suresh
82973cfa32 Import parser added to docs in API guide 
Added missing import statements in code snippet of API guide.

Closes-Issue: #3727
 2015-12-12 21:59:08 +05:30
Luis San Pablo
fbd89d6b7e Moved SETTINGS_DOC 2015-12-12 02:02:53 -06:00
Tom Christie
ff4bc43a2f Merge pull request #3721 from raphaelmerx/rm-format 
Fixed suggestion for format in test renderer
 2015-12-11 09:13:48 +00:00
Xavier Ordoquy
7a5d81c0b4 Add extra args/kwargs to authtoken's views (#3718) 2015-12-11 07:16:04 +01:00
Raphael Merx
fcc0a70f7c Fixed suggestion for format in test renderer 
Rendered would suggest using format='JSON' when the right argument is
format='json'.
 2015-12-10 15:19:03 -08:00
Xavier Ordoquy
e83175323b Merge pull request #3714 from knbk/set_app_name 
Add app_name to rest_framework.urls.
 2015-12-08 09:59:11 +01:00
Luis San Pablo
a615e37277 Removed depreceated constant 2015-12-07 23:30:45 -06:00
Luis San Pablo
b6e59c33a7 Merge branch 'settings_errors' of github.com:Cheglader/django-rest-framework into settings_errors 2015-12-07 23:25:49 -06:00
Luis San Pablo
5802dc0f98 Initial, fixes #3644 2015-12-07 23:25:40 -06:00
Luis San Pablo
60c4fe10b1 Refactor Constants 2015-12-07 23:19:24 -06:00
Luis San Pablo
0f85165b69 Fixed num args for % 2015-12-07 22:36:02 -06:00
Luis San Pablo
5117dad2ca removed setting typo 2015-12-07 22:32:23 -06:00
Luis San Pablo
4be3535b04 Merge branch 'settings_errors' of github.com:Cheglader/django-rest-framework into settings_errors 2015-12-07 22:31:58 -06:00
Luis San Pablo
9db4c2ae8a --ammend 2015-12-07 22:31:09 -06:00
Luis San Pablo
1b3e4332e8 --ammend 2015-12-07 22:24:22 -06:00
Luis San Pablo
4e5c57ab46 type on test case 2015-12-07 22:19:58 -06:00
Luis San Pablo
03c7f149ac Test case for settings check 2015-12-07 22:17:33 -06:00