6222 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	75a63c2c2e	Merge pull request #3643 from jpadilla/django19-rc ... Test against Django 1.9rc1	2015-11-17 14:03:42 +00:00
José Padilla	e2ac148367	Test against Django 1.9rc1	2015-11-17 09:58:55 -04:00
José Padilla	5cde5c6adf	Merge pull request #3642 from willdady/master ... Removing references to get_paginate_by() as it no longer exists.	2015-11-17 09:44:50 -04:00
Will Dady	ca0841576f	Removing references to get_paginate_by() as it no longer exists.	2015-11-17 15:00:00 +11:00
Tom Christie	316c374b02	Merge pull request #3635 from martinhill/issue_3634 ... Relation fields no to_fields attribute attribute break serializer	2015-11-16 16:20:38 +00:00
Martin Hill	ff36cbe4ba	same logic, more pythonic	2015-11-14 23:04:32 -05:00
Martin Hill	bac6f1fcf4	check if field.to_fields is None	2015-11-14 18:26:29 -05:00
Martin Hill	e475464945	fix for issue #3634	2015-11-14 17:00:07 -05:00
Xavier Ordoquy	4eef2ea21e	Merge pull request #3600 from nfletton/fix/browser/single-tab-render ... Fix regression causing raw data form to not display	2015-11-13 13:24:47 +01:00
Tom Christie	5899b00dac	Merge pull request #3626 from linovia/bug/fix_failing_py35_test_case ... Fix module name with Python 3.5 (#3534)	2015-11-12 10:01:36 +00:00
Xavier Ordoquy	795cf4716d	Fix module name with Python 3.5	2015-11-11 17:44:46 +01:00
Tom Christie	944a1711ec	Merge pull request #3606 from ryanhiebert/tox-no-basepython ... Don't specify unnecessary basepython	2015-11-06 08:14:08 +01:00
Ryan Hiebert	240eb672af	Don't specify basepython ... tox automatically includes basepython definitions for all the common python versions, and will recognize it in factors of envs in the envlist.	2015-11-05 12:12:29 -06:00
Xavier Ordoquy	2704036ad5	Merge pull request #3602 from vkaracic/patch-1 ... Typo	2015-11-05 11:52:52 +01:00
Vedran Karačić	ede15645e0	Typo	2015-11-05 11:51:29 +01:00
nfletton	f85ad301eb	Fix regression causing raw data form to not display	2015-11-04 15:43:25 -07:00
Tom Christie	7d59991636	Merge pull request #3595 from jpadilla/update-version ... Test against Django 1.8.6	2015-11-04 22:14:13 +00:00
José Padilla	08a00ce46d	Test against Django 1.8.6	2015-11-04 13:27:19 -04:00
Tom Christie	d959c6337a	Release notes	2015-11-04 14:59:09 +00:00
Tom Christie	33b512b1f2	Version 3.3.1	2015-11-04 14:49:57 +00:00
Tom Christie	544c24e7cb	Merge pull request #3593 from tomchristie/primary-key-check-for-to-field ... Proper 'primary key' checking on to_fields.	2015-11-04 14:49:11 +00:00
Tom Christie	54b79db214	Proper 'is primary key' checking	2015-11-04 14:37:32 +00:00
Tom Christie	95f92e995c	Merge pull request #3560 from ericholscher/fix-empty-filter ... Allow HTML to render when no filter_class is defined.	2015-11-04 14:20:03 +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
Tom Christie	d587ad1021	Use REST framework request parsing when accessing old-style .POST	2015-11-04 14:10:51 +00:00
Xavier Ordoquy	950e5e0fec	Merge pull request #3589 from ryanhiebert/docs-custom-hyperlinks ... docs - reverse needs kwargs keyword	2015-11-04 08:05:41 +01:00
Ryan Hiebert	b86e5af878	reverse needs kwargs keyword ... Since we aren't passing in any args, we must specify kwargs as a keyword argument.	2015-11-03 21:45:21 -06:00
Tom Christie	ae008316fa	Merge pull request #3585 from TravisJMorton/patch-1 ... typo	2015-11-02 21:30:47 +00:00
Travis J Morton	03cb959416	typo	2015-11-02 12:58:21 -08:00
Tom Christie	63ac8ac4ab	Merge pull request #3553 from adamzap/doc-section-permalinks ... Add section permalinks to docs	2015-11-02 16:18:22 +00:00
Tom Christie	d6b9cf6b6b	Merge pull request #3583 from davidszotten/filtering-docs-images ... fix image paths	2015-11-02 15:34:13 +00:00
David Szotten	9a14613f41	fix image paths	2015-11-02 15:28:02 +00:00
José Padilla	119a073299	Merge pull request #3576 from michael-k/readme ... Updated readme to reflect 3.3 release	2015-10-30 08:15:54 -04:00
Michael K	aa5331de8e	Updated readme to reflect 3.3 release	2015-10-30 13:04:44 +01:00
Xavier Ordoquy	ce491b3424	Merge pull request #3568 from jpadilla/decimal-validator ... Add compat util for DecimalValidator	2015-10-30 12:54:08 +01:00
José Padilla	7d79cf35b7	Add regression test for DecimalField mapping	2015-10-30 07:47:11 -04:00
José Padilla	08e4a98822	Merge pull request #3564 from mcastle/patch-1 ... Fix trans template tag error on admin	2015-10-30 06:29:25 -04:00
Xavier Ordoquy	48b0efbe2f	Merge pull request #3572 from jamesbeith/docs-missing-import-for-example ... Adds import for `Response`	2015-10-29 16:55:35 +01:00
James Beith	0143586541	Adds import for Response	2015-10-29 15:48:45 +00:00
Xavier Ordoquy	eeafd40ccd	Merge pull request #3571 from JocelynDelalande/patch-2 ... typo on relations docstring	2015-10-29 16:23:55 +01:00
JocelynDelalande	3b25207099	typo	2015-10-29 16:20:44 +01:00
Xavier Ordoquy	dd512a8ec0	Merge pull request #3570 from mrhwick/third-party-docs ... Added django-rest-framework-version-transforms.	2015-10-29 15:49:49 +01: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
José Padilla	41d1e42e9c	Add compat util for DecimalValidator	2015-10-29 06:42:16 -04:00
José Padilla	6f6f794be5	Merge pull request #3566 from jcugat/announcement-typo ... Fix announcement link typo	2015-10-29 06:13:58 -04:00
Josep Cugat	5b7de4f537	Fix announcement link typo	2015-10-29 10:21:46 +01:00
Marlon	3c6ce9dfc0	Fix trans template tag error ... Trans template tag requires `{% load i18n %}` at top of template.	2015-10-28 22:47:52 -05:00
Eric Holscher	32bd1a2f0b	Use better names for filter variable	2015-10-28 14:36:24 -07:00
José Padilla	a67d23139c	Merge pull request #3556 from rense/master ... format_html was missing in optional_logout template-tag	2015-10-28 17:16:36 -04:00