encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-28 20:44:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,413 Commits 18 Branches 132 Tags 105 MiB
78da1a824f
Commit Graph

968 Commits

Author SHA1 Message Date
Tom Christie
35320b1f2d Add bullet points to release notes [ci skip] 2016-08-05 12:41:15 +01:00
Tom Christie
f9cf22edc8 Version 3.4.2 (#4360) 2016-08-05 12:38:19 +01:00
Tom Christie
48a2f084aa Minor docs tweak [ci skip] 2016-07-28 13:38:05 +01:00
Tom Christie
449ec1d724 Version 3.4.1 [ci skip] (#4326) 2016-07-28 13:34:35 +01:00
Hendra
48465a667a Remove outdated resources (#4295) 
Removed links to Youtube videos that are no longer available and updated a link to a tutorial that has moved.
 2016-07-26 11:03:05 +01:00
Tom Christie
aa40c58381 Note 'coreapi dump' command 2016-07-14 12:33:54 +01:00
Tom Christie
06751f8548 Minor docs tweaks 2016-07-13 16:59:15 +01:00
Tom Christie
6f8a0f2a68 Update release docs 2016-07-13 16:46:50 +01:00
Tom Christie
8385ae42c0 3.4.0 Release (#4258) 
* 3.4.0 Release

* Version 3.4 release

* Full release notes

* Update translation files

* Update release documentation

* Update release notes

* Docs on supporting alternate schema formats

* Add schema_renderers to DefaultRouter
 2016-07-13 16:30:41 +01:00
Tom Christie
f319e073e8 Client docs 2016-07-11 11:54:53 +01:00
Tom Christie
c21994e778 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2016-07-08 16:38:47 +01:00
Tom Christie
c56d6d6bd3 Docs tweaks 2016-07-08 16:38:38 +01:00
Kenneth Schnall
ff5cfe3e84 Replace "class based views" occurrences with "class-based views" (#4251) 2016-07-08 08:38:50 +01:00
Tom Christie
6ff9840bde Schemas & client libraries. (#4179) 
* Added schema generation support.
* New tutorial section.
* API guide on schema generation.
* Topic guide on API clients.
 2016-07-04 16:38:17 +01:00
Kenneth Love
498ce85f34 Update third-party-resources.md (#4200) 2016-06-15 21:17:16 +01:00
Tom Christie
53a356a380 Fix docs link [ci skip] (#4165) 2016-06-02 10:35:18 +01:00
Adam Chainz
e3337ab4aa Convert readthedocs link for their .org -> .io migration for hosted projects 
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
 2016-05-29 23:26:56 +01:00
Tom Christie
9895de990d Fix signup URLs 2016-05-28 10:23:59 +01:00
Tom Christie
3a173547ad Funding announcement (#4147) 2016-05-26 11:48:15 +01:00
Xavier Ordoquy
1823662e1e Merge pull request #4044 from linovia/merge/3.3.x_to_master 
Merge the changes in 3.3.x back to master.
 2016-04-21 11:31:15 +02:00
Xavier Ordoquy
bff3bebdbe Merge remote-tracking branch 'reference/stable/3.3.x' into merge_test 
# Conflicts:
#	docs/topics/release-notes.md
 2016-04-08 15:46:17 +02:00
Xavier Ordoquy
95418eb8ac Add the medium collection related to Django REST framework. (#4043) 2016-04-08 14:43:10 +01:00
Raphael Gyory
b870101581 Update third-party-resources.md 2016-04-06 17:00:26 +02:00
Raphael Gyory
f1a384b61b Add Django Rest Messaging in Third party packages 2016-04-06 16:58:15 +02:00
Tom Viner
3e5a1397d7 remove trailing slash from cramer cursor link 2016-03-24 20:37:38 +00:00
S. Andrew Sheppard
101c178b8c links to html-json-forms package 2016-03-24 11:55:19 -05:00
Xavier Ordoquy
0e8306341d Merge pull request #3936 from carltongibson/null-uuid-fk-take2 
Fix None UUID ForeignKey serialization
 2016-03-22 22:46:33 +01:00
Stephan Groß
3785281d4c Add missing paginator in docs 2016-03-21 10:07:47 +00:00
Stephan Groß
91e869750e Fix typo 2016-03-21 08:57:43 +00:00
Xavier Ordoquy
f0fc339278 Release date update. 2016-03-14 08:40:00 +01:00
Xavier Ordoquy
6ea9a41408 Add #3962 in the last minute fixes. 2016-03-07 20:39:34 +01:00
Xavier Ordoquy
173c2f1e53 Release date update. 2016-03-07 20:22:47 +01:00
Xavier Ordoquy
0324429107 Add #3968 to the release notes. 2016-03-01 10:39:13 +01:00
Carlton Gibson
20d1fdba69 Fix None UUID ForeignKey serialization 2016-02-16 09:29:48 +01:00
Carlton Gibson
296c567645 Drop EOL Django 1.7 2016-02-15 16:07:42 +01:00
Xavier Ordoquy
c8ca3a1c05 Release notes for 3.3.3 2016-02-11 07:14:45 +01:00
Emmanouil Konstantinidis
ee2861887e Mention DRF Docs - Live API Endpoints 2016-01-23 23:08:19 +00:00
Xavier Ordoquy
221d6979c6 Fix the request data source. 2016-01-18 18:54:00 +01:00
Xavier Ordoquy
0051492963 Merge remote-tracking branch 'shvechikov/master' into feature/3776 2016-01-18 18:51:53 +01:00
Jerel Unruh
f71d8afdb0 Added documentation for the Third Party jsonapi.org package 2016-01-07 13:42:02 -06:00
Leonid Shvechikov
ff0292a757 Fix update model example in html-and-forms.md 2015-12-27 17:14:33 +03: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
Atul Varma
66de876dee Update bootstrap version in browsable-api.md 2015-12-19 10:34:39 -05:00
Xavier Ordoquy
5224feded4 Update the release date. 2015-12-14 07:32:50 +01:00
Xavier Ordoquy
bf18c9f6e3 3.3.2 release notes. 2015-12-14 07:22:30 +01:00
Tom Christie
bd8098e31f Fix template typo. 
Closes #3682.
Thanks for the report!
 2015-11-30 17:21:41 +00:00
Tom Christie
d959c6337a Release notes 2015-11-04 14:59:09 +00:00
Tom Christie
bfdf795843 Merge pull request #3592 from tomchristie/request-parsing-when-post-accessed 
Request parsing when .POST accessed
 2015-11-04 14:17:55 +00:00
James Beith
0143586541 Adds import for Response 2015-10-29 15:48:45 +00:00
Matthew Hardwick
86e1d2a1e5 Actually add the link. 2015-10-29 10:43:57 -04:00
Matthew Hardwick
f7289e6392 Added django-rest-framework-version-transforms. 2015-10-29 10:37:46 -04:00
Josep Cugat
5b7de4f537 Fix announcement link typo 2015-10-29 10:21:46 +01:00
Tom Christie
bb555e6e5e Version 3.3.0 2015-10-28 11:32:15 +00:00
Tom Christie
144cff97fa Include billing addresses in funding sign ups 2015-10-28 11:20:35 +00:00
Tom Christie
eeff5a1709 Merge branch 'master' into funding 2015-10-23 16:27:30 +01:00
Tom Christie
b2fb0deb34 Add latest item to the release notes 2015-10-23 16:15:44 +01:00
Tom Christie
0fb1ebcfcf Remove unused import 2015-10-23 16:07:48 +01:00
Tom Christie
ff285cfe66 TODO placeholder in release announcement 2015-10-22 15:15:55 +01:00
Tom Christie
7bfc420dc9 Add release notes, drop deprecated test 2015-10-22 15:11:10 +01:00
Tom Christie
4e7cc68ec9 Link tweaks 2015-10-22 14:42:35 +01:00
Tom Christie
ae852b2be4 Tweak links 2015-10-22 14:08:19 +01:00
Tom Christie
cf33008571 Release notes etc 2015-10-22 14:05:52 +01:00
Tom Christie
6305ae8916 Merge pull request #3475 from tomchristie/forms-api 
Forms API
 2015-10-22 09:59:57 +01:00
agconti
6757da5aab docs(third-party-resources): added cookiecutter-django-rest to misc third party resources 2015-10-18 20:13:09 -04:00
Tom Christie
90247afe29 Docs on Forms API 2015-10-12 21:14:58 +01:00
Rolf Håvard Blindheim
0e56b2ea74 Added drf-haystack to third party resources 2015-09-30 10:24:21 +02:00
Tom Christie
ed677f0138 Update docs for content overriding 2015-09-28 16:37:48 +01:00
Tom Christie
2d0b54e263 Merge branch 'drop-django-16' oft https://github.com/carltongibson/django-rest-framework into carltongibson-drop-django-16 
Conflicts:
	docs/topics/release-notes.md
 2015-09-28 11:17:48 +01:00
Tom Christie
ca8313aeac Merge branch 'master' into version-3.3 
Conflicts:
	docs/topics/release-notes.md
 2015-09-28 10:57:14 +01:00
Carlton Gibson
8d740a11e4 Adjust README and Release Notes 2015-09-22 16:39:25 +02:00
Carlton Gibson
2aa33ed544 Adjust README and Release Notes 2015-09-21 20:23:39 +02:00
Xavier Ordoquy
6ee3e29460 Add #3415 to the 3.2.4 release 2015-09-21 13:28:59 +02:00
Xavier Ordoquy
1054ea559c Fix the issue link. 2015-09-21 13:28:37 +02:00
Xavier Ordoquy
d85e7b9ccc Update Release notes for 3.2.4. 2015-09-20 22:03:52 +02:00
Miroslav Shubernetskiy
6926c71699 added django-url-filter to 3rd party libraries 2015-08-31 21:23:11 -04:00
Tom Christie
9aca6442a7 Add to the roadmap 2015-08-27 15:31:21 +01:00
Tom Christie
f646b469d4 Copy tweaks 2015-08-26 13:22:18 +01:00
Tom Christie
eb37f90dcd Tweak buisiness case 2015-08-26 13:09:22 +01:00
Tom Christie
32946f4160 Tweaks to roadmap 2015-08-25 14:03:30 +01:00
Tom Christie
0198bce34f Release 3.2.3 2015-08-24 10:59:52 +01:00
Tom Christie
1de197aa8d Tweaks for funding page 2015-08-20 10:10:06 +01:00
Tom Christie
c958d5d447 Redirect from www. to fund. when needed. 2015-08-19 12:35:23 +01:00
Tom Christie
0dc9f285be Paid plans title -> Funding 2015-08-19 12:16:00 +01:00
Tom Christie
b722b3b77a Note on bus factor 2015-08-14 13:08:54 +01:00
Tom Christie
71505e675a Flesh out the funding docs 2015-08-14 12:34:47 +01:00
Tom Christie
a0602104c3 Link to correct plans in sign up 2015-08-13 17:14:19 +01:00
Tom Christie
d80acd1f1f Initial draft of funding page 2015-08-13 14:17:27 +01:00
Tom Christie
1b53e804ee 3.2.2 Release 2015-08-13 10:23:22 +01:00
Tom Christie
0df99a6c95 Fix erronous request.files docs, and incorrect request.FILES behavior. Closes #3261. 2015-08-11 16:21:02 +01:00
Tom Christie
3ea394dbff Version 3.2.1 2015-08-07 14:55:18 +01:00
Tom Christie
e88f28dbad Call out supported versions. Closes #3232. 2015-08-07 14:47:00 +01:00
Simon Charette
bcc0d54f98 Fixed a small typo in the 3.2 release announcement. 2015-08-06 16:56:39 -04:00
Tom Christie
e3aaa323b7 Add 3.2 announcement 2015-08-06 14:18:23 +01:00
Tom Christie
a428d76ada Add 3.2 release notes 2015-08-06 13:18:18 +01:00
David Kaplan
8d7627a079 Update third-party-resources.md 
Add DRY Rest Framework reference onto the third party resources page.
 2015-07-30 10:51:44 -04:00
Tom Christie
99d9afc9d0 Remove out-of-date note on footer block in browsable API template. Closes #3187. 2015-07-27 09:18:41 +01:00
José Padilla
4f0220b780 Add missing link 2015-07-26 20:00:34 -04:00
Alexander Pitkin
6d4ae2c40f Fixed type in docs 
Fixed typo in Miscellaneous notes of 3.0 release announcement docs
 2015-07-13 16:46:14 +03:00
Derek Pauley
387dfd5dc3 Update rest-hypermedia-hateoas.md 
There was a typo under ## What REST framework doesn't provide. 

Original: What REST framework doesn't do is give you is machine readable hypermedia formats such as [HAL][hal],

Fixed: What REST framework doesn't do is give you machine readable hypermedia formats such as [HAL][hal],
 2015-07-11 13:23:57 -05:00
Miroslav Shubernetskiy
3bb9e251d7 added django-rest-framework-braces in Misc list of 3rd party tools 2015-07-06 17:35:21 -04:00
Matt Broach
b9e09e2f90 Added django-rest-multiple-models link to general Third Party resources page as well 2015-07-02 18:18:30 -04: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
886220cb70 Last minute pull request 2015-06-04 14:56:00 +01:00
Xavier Ordoquy
757e45acee Adding the last minute PR. 2015-06-04 14:37:01 +01:00
Xavier Ordoquy
bc778732bf Release notes for 3.1.3 2015-06-03 17:27:38 +01:00
Xavier Ordoquy
e8e1908097 Remove the checked box and add a todo list during development cycle. 2015-06-02 13:01:17 +01:00
Xavier Ordoquy
6c1a285c83 Add the translations to the process. 2015-06-02 10:17:19 +01:00
Anna Schneider
6553e253f3 Add drf-tracking to third-party-resources.md 2015-05-26 16:58:08 -07:00
Martin Di Palma
7449e29cf7 Links issues 
The following items had a wrong href value:

- Dont require pk strictly for related fields. (#2745, #2754)
- Restrict integer field to integers and strings. (#2835, #2836)
 2015-05-25 02:24:11 -03:00
André Ericson
e6e5a27836 Add Classy Django REST Framework(cdrf.co) to Third Party Resources 2015-05-22 17:18:59 -03:00
Xavier Ordoquy
6add1acc4e Add a few cosmetic changes to the release notes. 2015-05-14 11:18:18 +02:00
Xavier Ordoquy
475e431055 Fix the broken links. 2015-05-14 11:15:26 +02:00
Xavier Ordoquy
47d36f150b Add last minute PR. 2015-05-13 18:24:06 +02:00
Xavier Ordoquy
5c8df2c56b Release notes for 3.1.2 2015-05-13 09:44:04 +02:00
Jonathan Ellenberger
44317b4581 Adding django-versatileimagefield to DRF 3rd party docs 
Closes WGBH/django-versatileimagefield#12
 2015-05-07 14:23:24 -04:00
Rob Hudson
e6308155dd Update example of nested data 2015-04-08 21:38:02 -07:00
José Padilla
197027c87b Fix older release notes link 
Closes #2756
 2015-03-23 12:15:27 -04:00
Tom Christie
98809d12c9 Typo 2015-03-23 11:45:19 +00:00
Tom Christie
bbaee714fb Fix release date 2015-03-23 11:38:17 +00:00
Tom Christie
35a0cbb911 Add 3.1.x series header 2015-03-23 11:37:12 +00:00
Tom Christie
dbb6943298 Update release notes 2015-03-23 11:24:29 +00:00
Xavier Ordoquy
164be174ea Release notes for 3.1.1 and version bump. 2015-03-19 23:29:10 +01:00
Xavier Ordoquy
a02098b855 Fix the link to the old doc (#2681). 2015-03-13 00:15:53 +01:00
Xavier Ordoquy
3e44f788b1 Fixed a typo in the documentation's link. 2015-03-09 17:28:00 +01:00
José Padilla
d2181cc74c Fix customizing field mappings link 2015-03-06 09:41:34 -04:00
Tom Christie
7efb2fd9ed Better docs linking 2015-03-06 12:26:09 +00:00
Tom Christie
58dfde7fcd Tweaks for cursor pagination and docs 2015-03-06 10:22:32 +00:00
Tom Christie
efb42ff7d0 Update docs 2015-03-04 16:17:30 +00:00
Mateusz Sikora
b92d6df66a Update third-party-resources.md 2015-02-25 18:53:33 +01:00
Mateusz Sikora
71619a02c5 Update third-party-resources.md 2015-02-25 17:58:54 +01:00
Tom Christie
f1e517449a Minor docs tweak 2015-02-17 13:41:59 +00:00
Tom Christie
691ae5b646 Recommend 'pip list --outdated' instead of using pip-review 2015-02-17 13:40:59 +00:00
Tom Christie
028c477c22 Note on using pip-review in docs. 2015-02-17 12:56:19 +00:00
Tom Christie
4248a8d3fc Merge pull request #2198 from tomchristie/version-3.1 
Version 3.1
 2015-02-13 13:38:44 +00:00
Xavier Ordoquy
f6033cee87 Add release notes for 3.0.5. 2015-02-10 22:46:54 +01:00
Joar Leth
b18d773b51 Fix typo in 3.1 announcement 2015-02-09 22:51:49 +01:00
Tom Christie
fbb21caaaa Merge master 2015-02-09 20:43:50 +00:00
Tom Christie
1f99612845 Upgrade pending deprecations to deprecations 2015-02-06 13:21:35 +00:00
Tom Christie
1d4956f616 Pagination images 2015-02-06 13:08:04 +00:00
Tom Christie
53716f6152 Internationalization docs 2015-02-06 11:37:29 +00:00
Tom Christie
09488ad4da Link to ModelSerializer API 2015-02-06 00:25:03 +00:00
Tom Christie
6c63ef13cd Drop 2.x announcements 2015-02-06 00:04:20 +00:00
Tom Christie
41b213414d Updating release notes 2015-02-04 23:32:25 +00:00
Tom Christie
d015534d53 Fleshing out 3.1 announcement 2015-02-03 09:15:42 +00:00
Tom Christie
6e2ea852d0 Merge pull request #2498 from dustinfarris/update-eda-link 
Update link for ember-django-adapter
 2015-02-01 21:17:36 +00:00
Dustin Farris
2111a99b32 Update link for ember-django-adapter 2015-02-01 16:00:24 -05:00
José Padilla
9437d9b8ee Fix base_template name in example 2015-02-01 16:18:40 -04:00
Tom Christie
2cc4cb2465 Fix error text in test. 2015-01-31 08:53:40 +00:00
Tom Christie
0d96cf2ca2 Latest translation source messages. 2015-01-30 16:27:49 +00:00
Tom Christie
4ee4b4f2dc Merge master 2015-01-30 14:00:25 +00:00
Tymur Maryokhin
e720927b78 Removed deprecated '.model' docs 2015-01-29 17:28:18 +01:00
Xavier Ordoquy
925ea4bdc6 Release notes for 3.0.4 2015-01-27 19:43:38 +01:00
Tom Christie
fc70c0862f Galileo Press -> Rheinwerk Verlag 2015-01-26 14:07:21 +00:00
Tom Christie
6065cdbd93 Merge master 2015-01-19 15:16:57 +00:00
Tom Christie
564f845e21 Lower header font weights for nicer docs style 2015-01-13 12:21:03 +00:00
Tom Christie
8e2dc6b26d Update internationalization docs 2015-01-13 12:07:25 +00:00
Tom Christie
2b28026fc1 Translation info -> project management 2015-01-13 10:44:40 +00:00
Tom Christie
11efde8905 Merge pull request #2373 from jakul/document-translations-3.1 
Document how to translate DRF error messages (version 3.1)
 2015-01-09 11:57:02 +00:00
Xavier Ordoquy
ef16c546d7 Update the release note with latest fixes. 
Add the link to the 3.0.3 milestone.
 2015-01-08 23:29:51 +01:00
Xavier Ordoquy
02ee3871ae Merge remote-tracking branch 'origin/master' into release/3.0.3 2015-01-08 23:24:19 +01:00
Tom Christie
3dbcefb3c7 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-01-08 11:07:52 +00:00
Tom Christie
e61ef3d39f Minor docs updates 2015-01-08 11:07:47 +00:00
Tom Christie
18cefad3ab Update project-management.md 2015-01-07 21:03:50 +00:00
Tom Christie
1102e22cb4 Update project-management.md 2015-01-07 21:02:42 +00:00
Xavier Ordoquy
42f1932b52 Release notes for 3.0.3 2015-01-07 19:10:22 +01:00
Craig Blaszczyk
7913947757 add config and documentation about uploading/downloading translations from Transifex 2015-01-07 11:13:03 +00:00
Tom Christie
d3b2302588 Minor docs update. Refs #2375. 2015-01-05 16:31:52 +00:00
Craig Blaszczyk
9f169acb62 capitalise Django 2015-01-02 11:08:45 +00:00
Craig Blaszczyk
0b8a83bd62 update internationalisation instructions to prevent symlinking; add base .po file 2015-01-02 11:08:04 +00:00
Craig Blaszczyk
2781903a5a Add info about how django chooses which language to use 2015-01-02 11:07:58 +00:00
Craig Blaszczyk
7ad7dd6a42 match DRF style guide 2015-01-02 11:07:49 +00:00
Craig Blaszczyk
309b5d2641 instructions on how to translate REST framework error messages 2015-01-02 11:07:35 +00:00
Tom Christie
00531ec937 Release notes on non-text detail arguments. Closes #2341. 2014-12-26 15:48:16 +00:00
Tom Christie
9c9d5bd859 Added project management docs. 2014-12-18 13:35:42 +00:00
Tom Christie
c87e95c239 Add missing date 2014-12-17 21:11:06 +00:00
Tom Christie
2adfb6c3aa Cleanup extra newline 2014-12-17 16:00:49 +00:00
Tom Christie
bbd55fafc5 Version 3.0.2 2014-12-17 15:58:30 +00:00
Xavier Ordoquy
9c37174768 Fix the ghost backtick. 2014-12-11 15:58:02 +01:00
Xavier Ordoquy
3a69182cc9 Better link representation for the issues. 2014-12-11 15:32:52 +01:00
Xavier Ordoquy
75acdc93bc Fix the milestone link again. 2014-12-11 15:13:15 +01:00
Xavier Ordoquy
99423defd8 Add full stop to the release note items. 
Add link to the issues
Fix the milestone link
 2014-12-11 15:11:37 +01:00
Xavier Ordoquy
9a7b0755eb Add links to the issue id. 2014-12-11 15:06:10 +01:00
Xavier Ordoquy
ab801bb01f Release note corrections 2014-12-11 14:57:26 +01:00
Xavier Ordoquy
0188ca7306 Release notes for 3.0.1 2014-12-11 00:02:13 +01:00
Tom Christie
8ad0b83148 Minor docs tweaks 2014-12-10 14:29:21 +00:00
Tom Christie
dafc5d45a0 Minor docs tweaks to titles and citations 2014-12-10 12:28:48 +00:00
Tom Christie
cae19f8924 Minor docs tweaks 2014-12-09 13:21:10 +00:00
Tom Christie
4cdfb6adc2 Add REST framework: Under the hood. video to the 3.0 announcement. 2014-12-09 13:18:18 +00:00
Tom Christie
fd02d8266b Added 3.0 to release notes. 2014-12-08 15:16:33 +00:00
José Padilla
8ba4e7bafe Add misc note about localization 2014-12-08 09:18:37 -04:00
Tom Christie
deec61e0d6 Merge pull request #2173 from jpadilla/master 
Consolidate Django and test requirements
 2014-12-02 08:32:28 +00:00
Tymur Maryokhin
0a91999d6a Merge branch 'master' of github.com:tomchristie/django-rest-framework 2014-12-02 01:50:17 +01:00
José Padilla
bc0c25df30 Consolidate Django and test requirements 2014-12-01 17:31:11 -04:00
José Padilla
080fa4f5f8 Change allow_none to allow_null 2014-12-01 11:26:50 -04:00
Tom Christie
1caa14dd14 Minor 3.0 announcment tweaks 2014-12-01 12:22:21 +00:00
Tom Christie
270c7acdd7 Minor validtors tweak 2014-12-01 11:59:04 +00:00