Commit Graph

6780 Commits

Author SHA1 Message Date
Luke Murphy
66e86dc483 add rest-framework-generic-relations link to docs 2016-03-01 18:44:17 +01:00
Tom Christie
6b01c5f094 Merge pull request #3972 from szuliq/patch-1
Add `/en` to Heroku guidelines link
2016-03-01 13:59:31 +00:00
Krzysztof Szularz
2ddd30be90 Add /en to Heroku guidelines link 2016-03-01 14:52:07 +01:00
Xavier Ordoquy
97cc83483f Merge remote-tracking branch 'reference/stable/3.3.x' into stable/3.3.3 2016-03-01 10:39:34 +01:00
Xavier Ordoquy
0324429107 Add #3968 to the release notes. 2016-03-01 10:39:13 +01:00
Rex Kerr
f3b4cb5951 Fixes incorrect references to URLPathVersioning 2016-03-01 10:36:05 +01:00
Liping Wang
239815887d remove comma
remove comma
2016-03-01 10:35:41 +01:00
Liping Wang
05204333a5 [FIX] "@api_view" calling error.
"@api_view" usage error.
2016-03-01 10:35:41 +01:00
Xavier Ordoquy
c2cfb84308 Merge pull request #3971 from lynndotconfig/master
[change] using safer calling way of  "@api_view" in docs/tutorial/5-relationships-and-hyperlinked-apis.md
2016-03-01 10:20:21 +01:00
Liping Wang
c3cea1499f remove comma
remove comma
2016-03-01 15:46:20 +08:00
Jared Lang
7ac8cc760c Fix empty pk detection in HyperlinkRelatedField.get_url
This implementation allows detection of empty values that are non-nullable, allowing the field to return None values for such cases
2016-02-29 12:56:56 -08:00
Liping Wang
d372ccca02 [FIX] "@api_view" calling error.
"@api_view" usage error.
2016-02-29 19:51:33 +08:00
José Padilla
eec7c1754e Merge pull request #3969 from rexkerr/fix-versioning-docs
Fixes incorrect references to URLPathVersioning
2016-02-27 17:11:15 -04:00
Rex Kerr
88320b8a61 Fixes incorrect references to URLPathVersioning 2016-02-27 12:41:56 -08:00
Xavier Ordoquy
d85162c83d Merge pull request #3968 from linovia/bug/missing_auth_token_migration
Add missing migration file for #3887
2016-02-27 01:53:07 +01:00
Xavier Ordoquy
753f4dc477 Fix sorting order. 2016-02-27 01:46:59 +01:00
Xavier Ordoquy
6ea6e37ac9 Add missing migration file for #3887 2016-02-27 00:51:35 +01:00
Xavier Ordoquy
24a2ec0501 Merge remote-tracking branch 'reference/stable/3.3.x' into stable/3.3.3 2016-02-27 00:36:23 +01:00
Taranjeet
a609e4e1ca Docs: Fix repetitive word in the tutorial 2016-02-27 00:28:15 +01:00
Luke Murphy
c03c6c6e78 fix typo in relations docs 2016-02-27 00:27:41 +01:00
Tom Christie
a15e46af88 Merge pull request #3965 from ildoc/master
updated tutorial for django 1.9
2016-02-25 21:37:27 +00:00
José Padilla
82245be8f9 Merge pull request #3966 from staranjeet/typo-fix
Docs: Fix repetitive word in the tutorial
2016-02-25 14:59:22 -04:00
Taranjeet
3fd6db1445 Docs: Fix repetitive word in the tutorial 2016-02-26 00:02:45 +05:30
ildoc
35036aee15 updated tutorial for django 1.9 2016-02-25 14:27:57 +01:00
Xavier Ordoquy
450c76472b Merge pull request #3960 from lwm/fix-typo-relations
Fix typo in relations docs
2016-02-24 15:45:23 +01:00
Luke Murphy
f3c5802872 fix typo in relations docs 2016-02-24 14:22:24 +01:00
Tom Christie
a568d16ae4 Merge pull request #3950 from jpadilla/templates
Create issue and pull request templates
2016-02-22 16:03:06 +00:00
José Padilla
9c2899f6c8 Create issue and pull request templates 2016-02-22 11:17:02 -04:00
José Padilla
69c0de4faa Merge pull request #3953 from akarambir/remove-old-django-checks
Closes #3952: Remove old django checks from tests and compat
2016-02-19 11:08:45 -04:00
José Padilla
0b6f53eb98 Merge pull request #3943 from erickwilder/3937-accept-callable-as-initial-value
Closes #3937. Support callable as the value of `initial` for any `serializer.Field`
2016-02-19 10:41:23 -04:00
Erick Wilder
a32baeab0c Use datetime example for the Field.initial attribute
Just like regular Django fields, the example adopted uses a `datetiume.date.today` to
illustrate the functionality.
2016-02-19 09:53:50 +01:00
Karambir Singh Nain
69f1e3a9fd Remove old django checks from tests and compat
Remove skipping of tests for Django<1.8. Remove several functions from compat.py not needed for Django>=1.8
2016-02-19 01:47:45 +05:30
Xavier Ordoquy
5ace7174d4 Merge pull request #3949 from meoooh/patch-2
fix typo
2016-02-18 09:15:39 +01:00
meoooh
5cda3a04dd fix typo
fix typo
2016-02-18 14:43:41 +09:00
José Padilla
c6dadc062d Merge pull request #3946 from linovia/feature/remove_page_info_in_pagination_error_msg
Remove page information in pagination error messages
2016-02-17 22:48:30 -04:00
Xavier Ordoquy
5e08231453 Remove informations about why the pagination didn't work.
We remove a couple of informations to lower the exposition of our internals.
2016-02-17 18:18:19 +01:00
José Padilla
bec5f3db83 Merge pull request #3941 from wesgt/master
fix typo
2016-02-17 07:11:36 -04:00
José Padilla
0e1c1f6b91 Merge pull request #3940 from jianlin/typo-fix
fix typo
2016-02-17 07:11:04 -04:00
Erick Wilder
908efd6656 #3937 Update docs for the Field.initial attribute.
Add an usage example on how to pass a callable to the `Field.initial` in the docs.
2016-02-17 11:01:09 +01:00
Erick Wilder
8109752061 Closes #3937. Support callable as the value of initial for any serializer.Field 2016-02-17 10:52:21 +01:00
Wes
b773f03bd0 fix typo 2016-02-17 16:35:53 +08:00
Kin
96644bd6c1 fix typo 2016-02-16 23:08:45 -08:00
Carlton Gibson
cbb8d8d254 Test deserialising data including None fk 2016-02-16 09:38:42 +01:00
Carlton Gibson
20d1fdba69 Fix None UUID ForeignKey serialization 2016-02-16 09:29:48 +01:00
Xavier Ordoquy
79dad012b0 Merge pull request #3933 from carltongibson/drop-django-17
Drop EOL Django 1.7
2016-02-15 19:59:00 +01:00
Carlton Gibson
296c567645 Drop EOL Django 1.7 2016-02-15 16:07:42 +01:00
Xavier Ordoquy
2fc44402f9 Merge pull request #3928 from linovia/feature/pandoc_for_setup
Use pandoc to generate a nice PyPI information page.
2016-02-12 14:52:17 +01:00
Xavier Ordoquy
f48ccad581 Fail hard during publish if pandoc isn't available. 2016-02-12 13:43:18 +01:00
Xavier Ordoquy
f5822e7b71 Bump version to 3.3.3 2016-02-12 13:23:08 +01:00
Xavier Ordoquy
72ecd32c6b Use pandoc to generate a nice PyPI information page. 2016-02-12 13:15:20 +01:00