encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-02 14:34:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,030 Commits 18 Branches 132 Tags 105 MiB
a8534baa41
Commit Graph

7030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luis San Pablo
13c66b9dfe Return error 2015-12-07 21:53:33 -06:00
Luis San Pablo
d86a901aff Removed Settings raise attribute error 2015-12-07 21:45:44 -06:00
knbk
e203967e09 Add app_name to rest_framework.urls. 
This allows users in Django 1.9+ to include the authentication urls
without specifying the namespace, as in:

    urlpatterns = [
        ...
        url(r'^auth/', include('rest_framework.urls'))
    ]
 2015-12-08 02:25:00 +01:00
Xavier Ordoquy
f3949e994d Update base translation file. 2015-12-07 18:56:47 +01:00
Tom Christie
c227b8188e Merge pull request #3705 from mcastle/patch-2 
Admin and API browser fails for views without a filter_class
 2015-12-07 10:10:24 +00:00
Xavier Ordoquy
6bbb2890cb Merge pull request #3701 from Cheglader/master 
Fix #3628 by implementing __getnewargs__()
 2015-12-07 10:45:06 +01:00
Xavier Ordoquy
b8d109f2cf Merge pull request #3709 from qrilka/patch-1 
Fixed versioning regexp
 2015-12-07 10:22:59 +01:00
Kirill Zaborsky
85db6a681b Fixed versioning regexp 
booking list regexp was fixed in 8b97bb8f68 but single booking wasn't for some reason, and `v1v2/bookings/123/` shouldn't be allowed here
 2015-12-07 10:59:57 +03:00
Marlon
c1b70538a2 Resolve #3596 
Uses #3597, but without using `Context`.
 2015-12-05 11:10:39 -06:00
Piotr Śniegowski
2faa7bc288 Add missing csrf_token in AdminRenderer post form. 2015-12-04 23:23:56 +01:00
Luis San Pablo
4b59681c60 Fixed Class Newlines 2015-12-04 05:57:09 +00:00
Luis San Pablo
84b5e41af8 Fixes #3628 2015-12-04 05:48:56 +00:00
Luis San Pablo
4092cef392 Fixed Test Case for Hyperlink 2015-12-04 05:42:46 +00:00
Luis San Pablo
8501f59216 Hyperlink Test Case 2015-12-04 05:30:39 +00:00
Luis San Pablo
dfc84d9818 Force Build 2015-12-03 21:17:21 +00:00
Luis San Pablo
44a3d41ce9 Implement __getnewargs__ for #3628 2015-12-03 21:12:03 +00:00
Tom Christie
9f74b8860e Merge pull request #3687 from benred42/3679-UUIDField-validation 
Fixed #3679 -- UUID Validation
 2015-12-02 10:04:54 +00:00
Xavier Ordoquy
17267bfc32 Merge pull request #3689 from jpadilla/django19 
Use latest release of Django 1.9
 2015-12-02 08:15:53 +01:00
José Padilla
eba6229b24 Use latest release of Django 1.9 2015-12-01 21:44:22 -04:00
bphillips
c153bcb479 Added validation to UUIDField to properly catch invalid input types (lists, tuples, etc). 2015-12-01 14:09:10 -05:00
José Padilla
d2f90fd6af Merge pull request #3662 from awwester/ticket_3228 
#3228 - add confirm modal for delete
 2015-12-01 10:50:34 -04:00
Adam Wester
6d1ed851b5 #3228 - add confirm modal for delete 2015-12-01 07:51:29 -05:00
Tom Christie
832d6322a7 Merge pull request #3631 from syphar/paginat 
allow setting a custom Django Paginator class
 2015-11-30 20:58:32 +00:00
Tom Christie
bd8098e31f Fix template typo. 
Closes #3682.
Thanks for the report!
 2015-11-30 17:21:41 +00:00
José Padilla
68285a9bc2 Merge pull request #3683 from nikolas/patch-2 
Add missing link to django-crispy-forms
 2015-11-30 12:18:04 -04:00
Nik Nyby
e3f62e230c Add missing link to django-crispy-forms 2015-11-30 10:48:56 -05:00