Tom Christie
b3956bc591
Upgrade testing env name to django18beta
2015-02-26 13:23:05 +00:00
Tom Christie
6bbd509f34
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2015-02-26 13:20:45 +00:00
Tom Christie
8f988466a5
Docs on exception handler context. Closes #2604 .
2015-02-26 13:20:26 +00:00
Tom Christie
88cd86c956
Merge pull request #2587 from jpadilla/select-multiple-disabled
...
Disable select field if no choices available
2015-02-26 12:54:58 +00:00
Tom Christie
e72428214c
Formally upgrade suport to Django 1.8-beta
2015-02-26 12:53:24 +00:00
Tom Christie
03818ed004
Pagination tweaks and docs
2015-02-26 12:48:34 +00:00
Tom Christie
44d42221ca
Merge pull request #2605 from Tivix/master
...
adding django-rest-auth to Third Part Resources and Authentication
2015-02-26 09:13:11 +00:00
Danilo Bargen
86c5fa2401
Force-evaluate querysets (see #2602 )
2015-02-25 18:54:47 +01:00
Mateusz Sikora
b92d6df66a
Update third-party-resources.md
2015-02-25 18:53:33 +01:00
Mateusz Sikora
e51dc1855c
Update authentication.md
2015-02-25 18:51:20 +01:00
Mateusz Sikora
71619a02c5
Update third-party-resources.md
2015-02-25 17:58:54 +01:00
Tom Christie
5688d8b736
Merge pull request #2601 from k4nar/refactor_simplerouter
...
Remove duplicated code in routers.SimpleRouter
2015-02-25 13:04:49 +00:00
Yannick PEROUX
940cf2e2e0
Remove duplicated code in routers.SimpleRouter
2015-02-25 13:29:07 +01:00
Tom Christie
90f1c04c6b
Merge pull request #2595 from k4nar/fix_url_path
...
Fix url_path on dynamic routes for inherited viewsets. Fix #2583
2015-02-25 11:36:05 +00:00
Yannick PEROUX
9cafdd1854
Add a test for #2583 fix
2015-02-25 11:54:56 +01:00
Yannick PEROUX
bdc64d4e73
Fix removal of url_path on @detail_route and @list_route. Fix # #2583
...
SimpleRouter.get_routes was popping out the url_path kwarg from
list_route and detail_route decorators. This was causing troubles
when the route was re-used, for example if the viewset was
inherited.
2015-02-25 11:54:11 +01:00
Tom Christie
b69032f3a7
Merge pull request #2586 from rense/master
...
Set field max_length/max_value as actual attribute.
2015-02-21 15:31:02 +00:00
José Padilla
bab36779a0
Merge pull request #2589 from ludbek/master
...
updated outdated link at testing.md#APIClient
2015-02-21 11:25:52 -04:00
Rense VanderHoek
91416632a8
DecimalField fix
...
max_value and min_value are not in kwargs
2015-02-21 12:31:37 +01:00
ludbek
f29b657798
updated outdated link at testing.md#APIClient
2015-02-21 07:52:56 +05:45
Tom Christie
d0539a11e9
Merge pull request #2588 from maryokhin/master
...
Check if sessions are enabled before calling logout.
2015-02-20 20:28:20 +00:00
Tymur Maryokhin
7345830c88
Check if sessions are enabled before calling logout. Closes #2545 .
2015-02-20 20:12:39 +01:00
Rense VanderHoek
9cb547b85f
Validator-fix, added min/max fields to test_metadata
2015-02-20 17:34:49 +01:00
José Padilla
bb8690cfb3
Disable select field if no choices available
2015-02-20 11:43:12 -04:00
Rense VanderHoek
c8609ba652
Set field length/values as actual attributes.
...
The SimpleMetadata class in metadata.py tries to getattr() attributes
on a field. For this to work, max_length and min_length have to be
actually set as an attribute.
Did the same for min_value and max_value and added those two to
SimpleMetadata.get_field_info
2015-02-20 16:31:12 +01:00
aRkadeFR
c0916c2859
Documentation test fix double word
2015-02-20 15:59:10 +01:00
Carlton Gibson
dc8cc86077
Merge pull request #2580 from jpadilla/master
...
Fixes HiddenField being rendered in HTMLFormRenderer
2015-02-20 13:00:46 +01:00
Rubén Durá Tarí
60617f876a
Fixes HiddenField being rendered in HTMLFormRenderer
2015-02-20 07:50:15 -04:00
José Padilla
777f4e8212
Failing test for #2552
2015-02-19 12:23:44 -04:00
Aider Ibragimov
aa7ed316d8
Return UniquenessTogetherModel to previous state
2015-02-19 18:09:04 +03:00
Aider Ibragimov
fe8d95f93e
Skip validation of NULL field only if it part of unique_together
2015-02-19 18:03:44 +03:00
Aider Ibragimov
3d85473edf
Fix UniqueTogetherValidator for NULL values
2015-02-18 21:00:12 +03:00
José Padilla
4f1506c77e
Merge pull request #2562 from phalt/force-auth-docs
...
Add import example for force_authenticate in testing
2015-02-18 12:20:09 -04:00
Paul Hallett
d9c652813d
add missing import in tests
2015-02-18 15:53:57 +00:00
Tom Christie
3a71b6c9f5
Merge pull request #2569 from k4nar/k4nar-requests-typo
...
Fix typo in requests.md
2015-02-17 16:46:27 +00:00
Yannick PÉROUX
30e6f32f6f
Fix typo in requests.md
2015-02-17 17:08:30 +01:00
Tom Christie
e45e0f0567
Update version
2015-02-17 13:44:42 +00:00
Tom Christie
f1e517449a
Minor docs tweak
2015-02-17 13:41:59 +00:00
Tom Christie
691ae5b646
Recommend 'pip list --outdated' instead of using pip-review
2015-02-17 13:40:59 +00:00
Tom Christie
466bbbb308
Merge pull request #2568 from tomchristie/requirements-refactor
...
Requirements refactor.
2015-02-17 13:03:56 +00:00
Tom Christie
028c477c22
Note on using pip-review in docs.
2015-02-17 12:56:19 +00:00
Tom Christie
9f4f9c9c9f
Single source of truth for requirements
2015-02-17 12:46:55 +00:00
José Padilla
85bf127943
Merge pull request #2567 from carltongibson/18-warning
...
Move `importlib` fallback into compat.
2015-02-17 08:39:06 -04:00
Tom Christie
dbd2352165
Fixes for latest pep8 updates. Refs #2563 .
2015-02-17 10:58:00 +00:00
Carlton Gibson
c5eb5b2201
Move importlib fallback into compat.
2015-02-17 11:55:15 +01:00
Tom Christie
76fe710c0d
Merge pull request #2565 from carltongibson/18-warning
...
Adjust importlib import
2015-02-17 10:25:56 +00:00
Carlton Gibson
daf1d59d0f
Adjust importlib import
2015-02-17 11:22:37 +01:00
Tom Christie
4248a8d3fc
Merge pull request #2198 from tomchristie/version-3.1
...
Version 3.1
2015-02-13 13:38:44 +00:00
Kevin Brown
84260b5dd6
Merge pull request #2550 from maryokhin/patch-1
...
Remove '.model' shortcut from viewset docs
2015-02-11 19:39:51 -05:00
Tymur Maryokhin
9d80335ac8
Remove '.model' shortcut from viewset docs. Refs #2486 . Closes #2549 .
2015-02-12 01:10:03 +01:00
