Commit Graph

135 Commits

Author SHA1 Message Date
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
Tom Christie
159c3de9fc Merge master 2014-10-31 15:19:15 +00:00
Tom Christie
254701230d Fix up validators docs 2014-10-31 13:58:40 +00:00
Tom Christie
2762205887 Validator documentation and tweaks 2014-10-31 13:47:36 +00:00
Tom Christie
702f47700d Updated requirements 2014-10-24 12:12:01 +01:00
Tom Christie
a8622adcd9 Update index.md 2014-09-29 16:57:40 +01:00
Collin Anderson
da385c9c1f remove patterns and strings from urls #1898 2014-09-23 17:10:02 -04:00
José Padilla
96c21b81f5 Add Third Party Resources Topic section 2014-09-13 13:53:40 -04:00
Jharrod LaFon
baa518cd89 Moved OAuth support out of DRF and into a separate package, per #1767 2014-09-05 15:30:01 -07:00
Tom Christie
2a61ed8bac 2.4 Release notes 2014-08-29 10:10:17 +01:00
Tom Christie
8b2052172c Add .model deprecation to release notes 2014-08-21 12:25:20 +01:00
Tom Christie
9372cc8c31 Deprecate .model attribute on views 2014-08-20 16:24:52 +01:00
Tom Christie
63d02dbea8 Drop six from compat. 1.4.2 is now the lowest supported version. 2014-08-19 17:06:55 +01:00
Tom Christie
e385a7b8eb Merge master 2014-08-19 10:11:10 +01:00
Tom Christie
dce30207da Remove kickstarter links from homepage and README 2014-08-18 11:09:53 +01:00
Xavier Ordoquy
4876bec9f5 Merge remote-tracking branch 'origin/master' into 2.4.0
Conflicts:
	rest_framework/fields.py
2014-07-26 00:06:56 +02:00
Tom Christie
4324f50437 Phrasing tweak 2014-07-18 11:54:51 +01:00
Tom Christie
ab34ddcf2f Typo 2014-07-18 11:53:23 +01:00
Tom Christie
550243fd26 Beef up the kickstarter announcement 2014-07-18 11:51:48 +01:00
Tom Christie
ead0e60099 Docs for kickstarter announcement 2014-07-17 17:17:41 +01:00
Tom Christie
6bf0f81b0b Kickstarter note on front page 2014-07-17 13:41:19 +01:00
Andreas Pelme
971578ca34 Support for running the test suite with py.test
* Get rid of runtests.py
 * Moved test code  from rest_framework/tests and rest_framework/runtests to tests
 * Invoke py.test from setup.py
 * Invoke py.test from Travis
 * Invoke py.test from tox
 * Changed setUpClass to be just plain setUp in test_permissions.py
 * Updated contribution guideline to show how to invoke py.test
2014-03-02 12:40:30 +01:00
Tom Christie
cbd214699d Tweak html for hidden h1 on homepage 2014-01-14 14:47:34 +00:00
JakeSidSmith
4655d34848 Added h1 and alt to logo to improve SEO
Added title attribution to logo
2014-01-14 14:40:36 +00:00
Tom Christie
78494401c5 Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains 2014-01-08 15:22:41 +00:00
Tom Christie
3050f0e82a Frontpage tweaks 2014-01-03 13:06:41 +00:00
Tom Christie
1f3f2741f5 Happy new year 2014-01-02 09:28:34 +00:00
Tom Christie
ca244ad614 Expanded notes in quickstart. Closes #1127. Closes #1128. 2013-12-13 15:30:59 +00:00
Andy Wilson
db19fba50d update installation example to work with django 1.6
looks like django.conf.urls.defaults was deprecated as of django 1.6
2013-12-06 22:31:07 -06:00
Tom Christie
de5b9e39dd First pass on contribution guide 2013-12-04 14:59:09 +00:00
Tom Christie
ca2bd616d9 Remove a couple of .html suffixes in docs 2013-11-19 11:01:27 +00:00
Tom Christie
dfc430caba Fix django guardian link 2013-09-12 20:27:23 +01:00
bwreilly
4a9dcfa760 added guardian as optional requirement, stubbed out object-level permission class 2013-09-06 11:01:31 -05:00
Tom Christie
556b4bbba9 Added note on botbot IRC archives 2013-08-29 20:04:00 +01:00