Xavier Ordoquy
0c97dd1806
Merge remote-tracking branch 'reference/master'
2015-06-02 13:04:57 +01:00
Xavier Ordoquy
1957679368
Merge pull request #2887 from ticosax/doom-transaction-on-error
...
Rollback the transaction on error if ATOMIC_REQUESTS is set.
2015-06-02 10:34:03 +01:00
Xavier Ordoquy
8fa3284620
Merge remote-tracking branch 'reference/master'
2015-06-02 10:24:28 +01:00
Tom Christie
7f6fb3183f
Merge pull request #2994 from linovia/documentation/add_warning_about_login
...
Add a warning about totally custom login views.
2015-06-02 09:51:08 +01:00
Xavier Ordoquy
d4dd22ff1c
Merge pull request #2997 from ticosax/fix-typo-duration-field
...
fix Typo
2015-06-02 08:27:11 +01:00
Nicolas Delaby
34dc98e8ad
improve wording
2015-06-02 09:19:58 +02:00
Nicolas Delaby
8ad38208a1
more assertions make the test more readable
2015-06-02 09:19:58 +02:00
Nicolas Delaby
d1371cc949
Use post instead of get for sanity of use-case.
2015-06-02 09:19:58 +02:00
Nicolas Delaby
c2d2417237
Tell default error handler to doom the transaction on error
...
if `ATOMIC_REQUESTS` is enabled.
2015-06-02 09:19:58 +02:00
Nicolas Delaby
27fd48586e
allow to pass arbitrary arguments to py.test
2015-06-02 09:19:18 +02:00
Nicolas Delaby
3f3a01b4b8
fix Typo
2015-06-02 09:18:24 +02:00
Xavier Ordoquy
d79956d40e
Translation update.
2015-06-02 00:20:46 +01:00
Xavier Ordoquy
4ad8c17371
Add a warning about totally custom login views.
2015-06-01 18:13:40 +01:00
Xavier Ordoquy
f8eacc5bc0
Merge pull request #2993 from linovia/bug/2894
...
MultipleChoiceField empties incorrectly on a partial update using multipart/form-data (#2894 )
2015-06-01 17:48:20 +01:00
Xavier Ordoquy
14055dd3f4
Merge pull request #2989 from ticosax/duration-field
...
Add DurationField
2015-06-01 17:38:57 +01:00
Nicolas Delaby
f701ecceb7
Add DurationField
2015-06-01 18:20:53 +02:00
Xavier Ordoquy
5c90bf9cc0
Fix for #2894 thanks to @carljm
2015-06-01 16:13:35 +01:00
Xavier Ordoquy
94e2d3ca61
Test case upgrade to use partial data
2015-06-01 16:13:12 +01:00
Xavier Ordoquy
989c08109b
Failing test case for #2894
2015-06-01 16:04:05 +01:00
Tom Christie
0fdaa0dbba
Merge pull request #2992 from linovia/feature/clean_mock_html_dir
...
Remove an extra MockHTMLDict definition.
2015-06-01 15:54:09 +01:00
Xavier Ordoquy
2f524ec1a3
Remove an extra MockHTMLDict definition.
2015-06-01 15:46:27 +01:00
Xavier Ordoquy
e3f856ff1d
Merge pull request #2975 from sheppard/read-only-nested
...
can't create nested serializers for unique_together relations
2015-06-01 12:01:40 +01:00
Tom Christie
a0f66ffc69
Merge pull request #2849 from d0ugal/master
...
Migrate from Google search to MkDocs.
2015-06-01 09:31:44 +01:00
Dougal Matthews
daad630aa0
Update MkDocs version
2015-05-31 18:32:47 +01:00
Dougal Matthews
f5aa163aac
Added a missing semicolon
2015-05-31 18:30:30 +01:00
Dougal Matthews
e6c7468055
Use the new pages structure.
...
This is optional, but will be required by MkDocs 1.0
2015-05-31 18:30:29 +01:00
Dougal Matthews
8ace80c287
Only load the search results when the search form is submitted for the
...
first time
2015-05-31 18:30:29 +01:00
Dougal Matthews
33666c459b
Remove Google search and replace it with Mkdocs
...
This change updates the modal to use MkDocs for search.
2015-05-31 18:30:29 +01:00
Dougal Matthews
eae9390f1b
Update <title> to match MkDocs changes
...
The {{ page_title }} and {{ site_name }} variables are now separated to
add flexibility th themes.
2015-05-31 18:30:29 +01:00
Dougal Matthews
d118cee7dd
As of MkDocs 0.12 the Home link was added back to the navigation
2015-05-31 18:30:29 +01:00
Dougal Matthews
64523f1edc
Update the Documentation 404.html template to subclass base.html
...
This allows us to delete lots of code and avoid hard-coding the
navigation. This does mean that {{ current_page }} isn't always
available and needs to be conditionally used.
2015-05-31 18:30:29 +01:00
Xavier Ordoquy
24855f70ac
Merge pull request #2987 from cosmith/patch-1
...
Fix minor typo
2015-05-30 23:17:07 +01:00
Corentin Smith
fa29f7dd1f
Fix minor typo
2015-05-30 17:57:35 +02:00
Tom Christie
512a6db21e
Merge pull request #2984 from marctc/patch-2
...
Update validators.md
2015-05-29 16:41:58 +01:00
Marc
9d624d5b6b
Update validators.md
...
Missing colon.
2015-05-29 16:57:13 +02:00
Xavier Ordoquy
ecb3ba5e1f
Merge pull request #2948 from bimusiek/master
...
Added test ensuring DecimalField accepts `2E+2` as 200 and validates decimal place correctly.
2015-05-29 11:52:33 +02:00
Xavier Ordoquy
6634ce0da5
Merge pull request #2977 from arnaudlimbourg/patch-1
...
THe DRF Any Permission is not maintained anymore
2015-05-28 17:05:21 +02:00
Arnaud Limbourg
5550f1534c
removing section since package is not maintained
2015-05-28 15:52:37 +02:00
S. Andrew Sheppard
4a3c844b7f
flake8
2015-05-28 08:29:15 -05:00
S. Andrew Sheppard
0b8b288be5
python2 compat
2015-05-28 08:20:43 -05:00
Arnaud Limbourg
2bfef08d3a
THe DRF Any Permission is not maintained anymore
2015-05-28 15:12:18 +02:00
S. Andrew Sheppard
8c7b5fc5c1
pop required extra_kwargs if read_only is set
2015-05-27 21:14:13 -05:00
S. Andrew Sheppard
805a915e7c
can't nest unique_together relations
2015-05-27 21:06:57 -05:00
Tom Christie
ab7cb44bc5
Merge pull request #2974 from jpadilla/master
...
Use shields.io instead of pypip.in
2015-05-27 16:18:30 +01:00
José Padilla
7eeb0e81c0
Use shields.io instead of pypip.in
2015-05-27 10:47:44 -04:00
Tom Christie
95a27a108d
Merge pull request #2933 from cancan101/overide_method_action
...
Set the action on a view when override_method regardless of its None-ness
2015-05-27 09:10:58 +01:00
José Padilla
ad3bb05a87
Merge pull request #2971 from aschn/master
...
Add drf-tracking to third-party-resources.md
2015-05-26 21:37:29 -04:00
Anna Schneider
9903392053
Merge pull request #1 from aschn/aschn-patch-2968
...
Add drf-tracking to third-party-resources.md
2015-05-26 17:01:24 -07:00
Anna Schneider
6553e253f3
Add drf-tracking to third-party-resources.md
2015-05-26 16:58:08 -07:00
Tom Christie
eeef85373c
Merge pull request #2962 from aericson/fix-dependency-of-mkdoc
...
Update mkdocs version to 0.12.2
2015-05-26 09:18:27 +01:00
