encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 04:07:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,267 Commits 18 Branches 132 Tags 104 MiB
86c5fa2401
Commit Graph

5267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danilo Bargen
86c5fa2401 Force-evaluate querysets (see #2602) 2015-02-25 18:54:47 +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
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
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
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
Tom Christie
ad32e14360 Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1 2015-02-11 14:19:18 +00:00
Tom Christie
c3425accde Fix incorrect HTML parsing for DictField 2015-02-11 14:19:07 +00:00
Xavier Ordoquy
637af1fc14 Merge pull request #2540 from linovia/release/3.0.5 
Release/3.0.5
 2015-02-10 23:48:38 +01:00
Xavier Ordoquy
59b3fe8f39 Bumped the version to 3.0.5 2015-02-10 22:48:04 +01:00
Xavier Ordoquy
f6033cee87 Add release notes for 3.0.5. 2015-02-10 22:46:54 +01:00
Tom Christie
b999db1c46 Merge pull request #2535 from carltongibson/search-filter-duplicates 
Fix duplicate results of `ManyToManyField` when using `SearchFilter`.
 2015-02-10 10:43:00 +00:00
Carlton Gibson
3522b69394 Add distinct call in filter_queryset 2015-02-10 10:51:38 +01:00
Carlton Gibson
d87bb67d11 Failing test case for #1488 2015-02-10 10:50:35 +01:00
Tom Christie
647d24a095 Merge pull request #2534 from JoarLeth/version-3.1 
Fix typo in 3.1 announcement
 2015-02-09 22:09:15 +00:00
Joar Leth
b18d773b51 Fix typo in 3.1 announcement 2015-02-09 22:51:49 +01:00
Tom Christie
fbb21caaaa Merge master 2015-02-09 20:43:50 +00:00
Tom Christie
7b639c0cd0 Drop django master from the build matrix. 
Currently always going to be a know failure case.
We can add it back when we start to consdier Django 1.9 support.
 2015-02-09 17:57:08 +00:00
Tom Christie
873fb69395 Merge pull request #2530 from tomchristie/attribute-proxying-fix 
Fix misleading `AttributeError` tracebacks on `Request` objects.
 2015-02-09 17:56:25 +00:00
Tom Christie
1a087c8c5b Fix .gitignore 2015-02-09 17:47:59 +00:00
Tom Christie
b2939c157d Fixes for latest version of pep8 2015-02-09 17:43:20 +00:00