Commit Graph

6203 Commits

Author SHA1 Message Date
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
Eric Holscher 378d6a1a19 Allow HTML to render when no filter_class is defined.
Previously it required a filter_class,
or else it would error when calling `cls()`.
This now sets the `filter` context to `None`
if one does not exist.

Fixes #3559
2015-10-28 12:39:20 -07:00
Rense VanderHoek 0d568ed59f format_html was missing in optional_logout template-tag
The new format_html() was still missing in optional_logout template-tag
at the NoReverseMatch exception.
2015-10-28 18:48:58 +01:00
Rense VanderHoek 6aef157daa Merge remote-tracking branch 'tomchristie/master' 2015-10-28 18:39:18 +01:00
José Padilla b8c9c809ff Merge pull request #3547 from nikolas/bootstrap-3.3.5
Update bootstrap from 3.2.0 to 3.3.5
2015-10-28 09:42:01 -04:00
Tom Christie bb555e6e5e Version 3.3.0 2015-10-28 11:32:15 +00:00
Tom Christie 372acbc4e9 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-10-28 11:21:06 +00:00
Tom Christie 144cff97fa Include billing addresses in funding sign ups 2015-10-28 11:20:35 +00:00
Adam Zapletal edf97be7be Add section permalinks to docs
- Configure mkdocs to use the toc markdown extension
- Only show section link styles on hover
2015-10-27 15:20:59 -05:00
Tom Christie fa6f053323 Merge pull request #3544 from dursk/nested-as-form-fields
Correctly handle False in NestedBoundField.as_form_field()
2015-10-27 16:55:36 +00:00
Tom Christie f7ea425001 Merge pull request #3546 from jpadilla/format-html
Use format_html in tags that generate HTML
2015-10-27 14:12:25 +00:00
Nik Nyby 8c6ded38de Update bootstrap from 3.2.0 to 3.3.5 2015-10-26 10:40:59 -04:00
José Padilla 21cad8646a Use format_html in tags that generate HTML 2015-10-25 08:31:28 -04:00
Matthew Madurski 8aed3d4862 Correctly handle false in nested as_form_field 2015-10-24 19:48:17 -04:00
Tom Christie af5474f9b3 Merge pull request #3539 from tomchristie/funding
Funding
2015-10-23 16:54:21 +01:00
Tom Christie eeff5a1709 Merge branch 'master' into funding 2015-10-23 16:27:30 +01:00
Tom Christie 84e9013417 Merge pull request #3531 from tomchristie/version-3.3
Version 3.3
2015-10-23 16:24:08 +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 9a78db2707 Merge pull request #3536 from jpadilla/filepathfield-mapping
Map all supported FilePathField options
2015-10-23 15:23:26 +01:00