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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
José Padilla
|
d64bfef56a
|
Map all supported FilePathField options
|
2015-10-23 10:08:29 -04:00 |
|
auvipy
|
fa93d79026
|
removed south_migrations directory
|
2015-10-23 10:00:01 -04:00 |
|
auvipy
|
b71e6b596f
|
removed south migrations
|
2015-10-23 10:00:00 -04: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
|
07b23c8685
|
Add version 3.3 to the docs index
|
2015-10-22 14:06:55 +01:00 |
|
Tom Christie
|
cf33008571
|
Release notes etc
|
2015-10-22 14:05:52 +01:00 |
|
Tom Christie
|
c53c9eddfe
|
Merge pull request #3315 from tomchristie/filters
First pass at HTML rendering for filters
|
2015-10-22 11:42:35 +01:00 |
|
Tom Christie
|
0c6d46729c
|
Docs on the filter HTML interface
|
2015-10-22 11:37:27 +01:00 |
|
Tom Christie
|
6305ae8916
|
Merge pull request #3475 from tomchristie/forms-api
Forms API
|
2015-10-22 09:59:57 +01:00 |
|
Xavier Ordoquy
|
71338ddd3f
|
Merge pull request #3528 from peterdemin/patch-1
Fixed grammar in docs for "Writable nested serializers"
|
2015-10-21 15:35:23 +02:00 |
|
Peter Demin
|
423e0de358
|
Fixed grammar in docs for "Writable nested serializers"
|
2015-10-21 09:33:34 -04:00 |
|
Tom Christie
|
58faebcdb1
|
Merge pull request #3526 from likeon/fk-to_field
Added support for the to_field on ForeignKey fields
|
2015-10-21 14:00:32 +01:00 |
|
likeon
|
322bda8159
|
Added support for the to_field on ForeignKey fields
|
2015-10-21 15:33:18 +03:00 |
|
José Padilla
|
825e67454d
|
Merge pull request #3527 from potpath/patch-2
Fix broken link caused by case sensitivity
|
2015-10-21 08:03:07 -04:00 |
|
potpath
|
9634cea474
|
Fix broken link caused by case sensitivity
|
2015-10-21 18:43:07 +07:00 |
|
Tom Christie
|
c68d932ac9
|
Merge pull request #3525 from tomchristie/django-19-beta
Test against Django 1.9 beta
|
2015-10-20 11:02:30 +01:00 |
|
Tom Christie
|
5b5d6f1d4b
|
Test against Django 1.9 beta
|
2015-10-20 10:53:45 +01:00 |
|
Tom Christie
|
0d1637d666
|
Minor docs update
|
2015-10-20 10:49:39 +01:00 |
|
José Padilla
|
4e24374c14
|
Merge pull request #3521 from agconti/master
docs(third-party-resources): added `cookiecutter-django-rest` to misc third party resources
|
2015-10-19 21:35:31 -04:00 |
|
Tom Christie
|
34eb18b498
|
Merge branch 'master' into filters
Conflicts:
rest_framework/compat.py
rest_framework/filters.py
|
2015-10-19 13:14:42 +01:00 |
|
Tom Christie
|
86470b7813
|
Merge pull request #3517 from thedrow/feature/set-and-dict-literals
Replaced all dict and set conversions from lists to dict and set literals
|
2015-10-19 09:46:36 +01:00 |
|