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

7526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ordoquy
6ad0be44d3 Merge remote-tracking branch 'reference/master' into feature/improve_schema_shortcut 
* reference/master:
  use django 1.11rc1 in tox
  Leave parameters with regex pattern as String
  restored original formatting
  Do not hint BigAutoField as integer (outside of range)
  Mention where the mixins live
  Try to improve browser support
  Cleanup and refactor docs api.js script
  Move bootstrap modal data attrs to anchor
  Remove unused base.js script
  Correctly set scheme in coreapi TokenAuthentication
  reverted to fix the issue without changing setting
  DEFAULT_PAGINATION_CLASS is changed to 'None'
  add content block and breadcrumbs_empty block to allow base.html to be reused
  Update 7-schemas-and-client-libraries.md
  Updated testimonial name on funding site
  ID must start from 1 again
 2017-03-24 15:21:43 +01:00
Tom Christie
0fdaf4f481 Merge pull request #5001 from jpadilla/docs-cleanup 
JavaScript cleanup in API Docs.
 2017-03-22 14:01:00 +00:00
Tom Christie
ac1d230482 Merge pull request #5015 from auvipy/patch-1 
use django 1.11rc1 in tox
 2017-03-22 09:38:01 +00:00
Tom Christie
8e9cb1e614 Merge pull request #5014 from dczech/feature/decouple-bigautofield 
Include URL path regexs in API schemas where valid.
 2017-03-22 09:37:07 +00:00
Asif Saifuddin Auvi
db4dd0c977 use django 1.11rc1 in tox 2017-03-22 14:40:23 +06:00
Sergey Petrunin
b0a0c30bfe Added pytz exception in compat module. 
Mock pytz.timezone localize in tests.
Ref: #4986
 2017-03-22 00:03:32 -04:00
Dariusz Czech
54d0901f38 Leave parameters with regex pattern as String 2017-03-21 15:15:20 +01:00
Dariusz Czech
9074e3e478 restored original formatting 2017-03-21 08:40:59 +01:00
Sergey Petrunin
e4a1bd140b Update error message. 
Ref: #4986
 2017-03-20 18:47:25 -04:00
Dariusz Czech
c7e2d1d976 Do not hint BigAutoField as integer (outside of range) 2017-03-20 22:21:07 +01:00
Tom Christie
7d64cf568a Merge pull request #4998 from COCOLMAN/master 
Ensure that pagination is not included in API schema when `page_size=None`.
 2017-03-20 15:32:44 +00:00
Tom Christie
9a8d29e784 Merge pull request #5000 from jpadilla/issue-4994 
Correctly set scheme in coreapi TokenAuthentication
 2017-03-20 09:55:06 +00:00
Xavier Ordoquy
1c33e84e28 Merge pull request #5005 from nicktimko/patch-1 
Mention where the mixins live
 2017-03-20 06:59:56 +01:00
Nick Timkovich
51c6d23a05 Mention where the mixins live 
Ctrl-F on the ViewSets page doesn't show where the `mixins.SomeMixin...` classes come from.
 2017-03-19 17:17:37 -05:00
Sergey Petrunin
d4726dab81 Fix bug for not existent or ambiguous datetime during native to aware conversion in timezone with DST. 
Ref: #4986
 2017-03-18 23:13:26 -04:00
José Padilla
9e18d005d1
Try to improve browser support 2017-03-17 22:21:14 -04:00
José Padilla
b0f2ec785e
Cleanup and refactor docs api.js script 2017-03-17 21:44:40 -04:00
José Padilla
d8507d3f9c
Move bootstrap modal data attrs to anchor 2017-03-17 21:44:11 -04:00
José Padilla
be0e196e65
Remove unused base.js script 2017-03-17 21:43:20 -04:00
José Padilla
7e76cd8695
Correctly set scheme in coreapi TokenAuthentication 2017-03-17 20:27:36 -04:00
sol HYUN
16aad89459 reverted to fix the issue without changing setting 2017-03-18 06:17:35 +09:00
sol HYUN
9c3edb0921 DEFAULT_PAGINATION_CLASS is changed to 'None' 
because the default value was specified, it did not work properly in API
Document
 2017-03-18 04:50:01 +09:00
Tom Christie
73ad88eaae Merge pull request #4993 from jeffcjohnson/master 
add content block and breadcrumbs_empty block to base.html for reuse
 2017-03-17 14:35:36 +00:00
Jeff Johnson
323f59091c add content block and breadcrumbs_empty block to allow base.html to be reused 2017-03-16 09:03:45 -04:00
Tom Christie
fb8cbab4cf Merge pull request #4991 from fakepoet/patch-1 
Fix Django url syntax.
 2017-03-16 12:26:46 +00:00
Dark Goat
3cf01b7350 Update 7-schemas-and-client-libraries.md 
fix django url syntax.
 2017-03-16 19:37:48 +08:00
Tom Christie
f3ccad8fea Merge pull request #4988 from ossanna16/master 
Updated testimonial name on funding site
 2017-03-16 09:11:00 +00:00
Xavier Ordoquy
e438c532ae Merge pull request #4985 from COCOLMAN/master 
ID must start from 1 again
 2017-03-16 07:18:49 +01:00
Anna
6a8aed03a8 Updated testimonial name on funding site 2017-03-16 06:00:57 +01:00
Sergey Petrunin
1ee54fb85c Added test for DateTimeField validation when server has timezone with DST and input is a native time in a DST shift interval. 
Added pytz to requirements-testing.txt to reproduce the case.
 2017-03-15 23:45:41 -04:00
sol HYUN
eb8c658f33 ID must start from 1 again 
At the beginning of tutorial4, The database had been removed
 2017-03-16 06:34:30 +09:00
Xavier Ordoquy
b558c9ecc4 Allow the documentation and schema shortcut functions to get a list of urls to introspect. 2017-03-15 08:07:12 +01:00
Tom Christie
3b466fabe7 Merge pull request #4973 from tomchristie/support-head-in-viewsets 
Support HEAD in viewsets
 2017-03-13 13:16:04 +00:00
Tom Christie
e94011eb77 Merge pull request #4972 from tomchristie/use-items-template-tag 
Use 'items' templatetag throughout.
 2017-03-13 12:53:25 +00:00
Tom Christie
43b38964ea Support HEAD in viewsets 2017-03-13 12:51:03 +00:00
Tom Christie
0173e9bd21 Use 'items' templatetag throughout. 2017-03-13 12:35:19 +00:00
Tom Christie
df2adbb423 Merge pull request #4957 from ossanna16/master 
Updated funding page
 2017-03-13 10:43:03 +00:00
Tom Christie
2df80c3c9d Merge pull request #4688 from theosotr/feature-source 
Support usage of 'source' in `extra_kwargs`.
 2017-03-13 10:25:38 +00:00
Tom Christie
d508a3dd1e Merge pull request #4967 from 0xKD/patch-2 
Update coreapi.js version in JavaScript API docs.
 2017-03-13 10:06:35 +00:00
Tom Christie
de9a8c4811 Fix mime type on schema.js endpoint. Closes #4968. 2017-03-13 10:03:13 +00:00
Kedar
9e62bc51ec Update coreapi.js version 2017-03-11 11:19:26 +05:30
Anna
ade7a254d5 Fixed mistakes for funding page PR 2017-03-10 23:06:01 +01:00
Anna
628c356832 Merge remote-tracking branch 'upstream/master' 2017-03-10 22:28:20 +01:00
Tom Christie
1d34bc0b92 Update release notes 2017-03-10 14:38:24 +00:00
Tom Christie
928f7cb40f Version 3.6.2 2017-03-10 13:00:08 +00:00
Tom Christie
7a8fb262f2 Fallback to more widely supported JS feature sets. (#4961) 2017-03-10 12:07:15 +00:00
Tom Christie
9ccdc4366f Merge branch 'master' of github.com:tomchristie/django-rest-framework 2017-03-10 10:59:39 +00:00
Tom Christie
9baa1fde15 Add 'mark_safe' in template tags. Closes #4952. Closes #4953. 2017-03-10 10:59:31 +00:00
Michael Palmer
81887bdc4e Add glyphicon fonts to static docs (#4951) 
* Fixes #4950.
 2017-03-10 10:37:31 +00:00
Tom Christie
5128004f54 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2017-03-10 09:10:54 +00:00