Commit Graph

168 Commits

Author SHA1 Message Date
Tom Christie
1c5dfc9c8d Merge pull request #3821 from zwernberg/master
update copyright 2016
2016-01-11 16:25:11 +00:00
Zach Wernberg
04b2f021a6 update copyright 2016 2016-01-11 08:13:07 -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
Nik Nyby
e3f62e230c Add missing link to django-crispy-forms 2015-11-30 10:48:56 -05:00
Tom Christie
bb555e6e5e Version 3.3.0 2015-10-28 11:32:15 +00:00
Tom Christie
eeff5a1709 Merge branch 'master' into funding 2015-10-23 16:27:30 +01:00
Tom Christie
cf33008571 Release notes etc 2015-10-22 14:05:52 +01:00
Tom Christie
90247afe29 Docs on Forms API 2015-10-12 21:14:58 +01:00
Tom Christie
02e1f69d2b Django 1.9 support 2015-09-28 11:44:07 +01:00
Tom Christie
d80acd1f1f Initial draft of funding page 2015-08-13 14:17:27 +01:00
Tymur Maryokhin
85e3edd7ff Update README and docs with 3.2 release 2015-08-07 12:12:01 +02:00
Tom Christie
e3aaa323b7 Add 3.2 announcement 2015-08-06 14:18:23 +01:00
Tom Christie
c8ad0cce19 Bump minimum Django version to 1.5 2015-07-30 15:43:39 +01:00
José Padilla
9bdf9a510e Remove Twitter button for mobile rendering 2015-06-23 07:17:12 -04:00
José Padilla
8554980c86 Add PyPI version badge to docs. Closes #3023 2015-06-23 06:22:35 -04:00
José Padilla
3abbeadfaf Django 1.8 is no longer in beta 2015-04-14 11:32:15 -04:00
José Padilla
140b94c32e Update to 3.1 release 2015-03-07 10:50:31 -04:00
Tom Christie
e72428214c Formally upgrade suport to Django 1.8-beta 2015-02-26 12:53:24 +00:00
Tom Christie
53716f6152 Internationalization docs 2015-02-06 11:37:29 +00:00
Tom Christie
6c63ef13cd Drop 2.x announcements 2015-02-06 00:04:20 +00:00
Tom Christie
4ee4b4f2dc Merge master 2015-01-30 14:00:25 +00:00
Carlton Gibson
790c92d438 Update Django-Filter references in docs and requirements. 2015-01-23 15:22:20 +01:00
Tom Christie
6065cdbd93 Merge master 2015-01-19 15:16:57 +00:00
Tom Christie
8e2dc6b26d Update internationalization docs 2015-01-13 12:07:25 +00:00
Tom Christie
42c913334b Minimum 1.6.x version is 1.6.3 2015-01-08 14:51:08 +00:00
Tom Christie
f529f83d3c Minimum Django 1.5 version issue 1.5.6 2015-01-08 14:38:23 +00:00
Tom Christie
17665aa52a Add docs for OAuth, XML, YAML, JSONP packages. Closes #2179. 2015-01-05 12:26:15 +00:00
Tom Christie
6168f60ba8 Merge branch 'master' into version-3.1 2015-01-05 11:02:28 +00:00
Tom Christie
5d8c45681a Update copryright for 2015. Closes #2247. 2014-12-28 18:48:42 +00:00
Tom Christie
435aef7738 Merge branch 'master' into version-3.1 2014-12-19 11:53:05 +00:00
Tom Christie
7105c1308e Add OPTIONS/metadata to docs index 2014-12-18 15:42:27 +00:00
Tom Christie
9c9d5bd859 Added project management docs. 2014-12-18 13:35:42 +00:00
Tom Christie
05a6eaec8a More docs, plus 'ALLOWED_VERSIONS' setting. 2014-12-17 12:41:46 +00:00
Tom Christie
baaa356489 Merge master 2014-12-12 15:37:43 +00:00
Tom Christie
3d6620c72a Merge 2014-12-03 23:24:06 +00:00
Tom Christie
6369f92125 Merge 2014-12-03 23:12:52 +00:00
eiriksm
74a9ece3dc Update build status icon on github pages page. 2014-12-03 13:37:56 +01:00
Tymur Maryokhin
0a91999d6a Merge branch 'master' of github.com:tomchristie/django-rest-framework 2014-12-02 01:50:17 +01:00
Tom Christie
b9503cd603 Support Django's core ValidationError for backwards compat. Refs #2145. 2014-12-01 10:48:45 +00:00
Tom Christie
72c4ec4e18 Add 3.0 announcement 2014-12-01 08:54:12 +00:00
Tymur Maryokhin
e2ea98e8ab Fixed typos 2014-11-29 20:23:55 +01:00
José Padilla
7f9dc73672 Remove XML support from core 2014-11-29 14:57:51 -04:00
José Padilla
731c8421af Remove YAML support from core 2014-11-29 14:43:05 -04:00
José Padilla
0cc990792c Merge branch 'version-3.1' into oauth_as_package
Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini
2014-11-28 12:14:40 -04:00
Tom Christie
8e549a76ea Add 2.x notes and links 2014-11-28 14:26:03 +00:00
Tom Christie
4ed0ae82e3 Add validators page 2014-11-25 16:29:14 +00:00
Tom Christie
b733f85ff1 Minor docs tweaks 2014-11-25 16:24:35 +00:00
Dougal Matthews
673f48242f Remove commented out title 2014-11-25 13:11:30 +00:00
Eleni Lixourioti
1aa7783095 Merge branch 'version-3.1' of github.com:tomchristie/django-rest-framework into oauth_as_package
Conflicts:
	.travis.yml
2014-11-15 14:27:41 +00:00
Tom Christie
0da30e6d1d Add note about 3.0 being merged to master 2014-11-03 14:43:00 +00:00