encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 19:43:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,316 Commits 18 Branches 132 Tags 105 MiB
dfd6a1f0fb
Commit Graph

5316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
dfd6a1f0fb Merge pull request #2658 from ddx/cursorpagination-docs-typo 
Fixed missing word in CursorPagination docs
 2015-03-09 08:48:03 +00:00
Deven Xie
20ba47e343 Fixed missing word in CursorPagination docs 2015-03-09 00:10:26 -04:00
Carlton Gibson
53e1a2fcb9 Merge pull request #2637 from mdentremont/topic/allow-serialize-unsaved-with-relations 
Support serializing unsaved models with related fields.
 2015-03-08 20:22:49 +01:00
José Padilla
0e21f1c4f4 Merge pull request #2640 from Crystalnix/fix-remove-mergedict 
Remove `MergeDict`
 2015-03-06 19:17:58 -04:00
Matt d'Entremont
fb58ef043c Add support for serializing models with m2m related fields 
- In both ManyRelatedField, provide an empty return when trying to
  access a relation field if the instance in question has no PK (so
  likely hasn't been inserted yet)
- Add relevant tests
- Without these changes, exceptions would be raised when trying to
  serialize the uncreated models as it is impossible to query
  relations without a PK
- Add test to ensure RelatedField does not regress as currently 
  supports being serialized with and unsaved model
 2015-03-06 12:50:37 -04:00
Tom Christie
3d0aaa9df2 Merge pull request #2643 from jpadilla/master 
Fix customizing field mappings link
 2015-03-06 14:01:35 +00:00
José Padilla
d2181cc74c Fix customizing field mappings link 2015-03-06 09:41:34 -04:00
Tom Christie
7efb2fd9ed Better docs linking 2015-03-06 12:26:09 +00:00
Tom Christie
c511342047 More docs on cursor pagination 2015-03-06 11:32:03 +00:00
Tom Christie
58dfde7fcd Tweaks for cursor pagination and docs 2015-03-06 10:22:32 +00:00
Egor Yurtaev
ce31e36973 Remove MergeDict 
The class MergeDict is deprecated and will be removed in Django 1.9
 2015-03-05 18:34:42 +06:00
Tom Christie
f7917928c0 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-03-04 16:17:44 +00:00
Tom Christie
efb42ff7d0 Update docs 2015-03-04 16:17:30 +00:00
Tom Christie
18cc0230bf Clean up pagination attributes 2015-03-04 15:51:00 +00:00
Tom Christie
932998134f Merge pull request #2628 from maryokhin/patch-2 
CreateOnlyDefault call default.set_context() only on create
 2015-03-03 16:23:42 +00:00
Tymur Maryokhin
391b0ae21b Call default.set_context() only on create. Refs #2619. 2015-03-03 17:02:12 +01:00
Tom Christie
5aa204e94f Merge pull request #2619 from kwood/master 
Updated CreateOnlyDefault to call set_context on its default
 2015-03-02 08:18:14 +00:00
Kevin Wood
b582d52afb Fix docstring formatting 2015-02-28 13:06:47 -08:00
Kevin Wood
78e8b1b010 Updated CreateOnlyDefault to call set_context on its default (if callable) 2015-02-27 22:14:15 -08:00
José Padilla
33c4278ec8 Merge pull request #2616 from jerzyk/fix_dictfield 
fix DictKey initial value
 2015-02-27 14:56:09 -04:00
Janusz Harkot
9098856d46 fix DictKey initial value 2015-02-27 19:46:36 +01:00
José Padilla
700af5dab2 Merge pull request #2584 from aRkadeFR/DocFixingTypo 
Documentation test fix double word
 2015-02-27 12:53:10 -04:00
aRkadeFR
9c359181d7 update for that the instead of that 2015-02-27 17:38:28 +01:00
José Padilla
f09d28e6d6 Merge pull request #2613 from Ian-Foote/python2-validators 
Ensure validators are new-style classes on python2
 2015-02-27 11:42:41 -04:00
Ian Foote
32c885c2a0 Ensure validators are new-style classes on python2 2015-02-27 15:22:19 +00:00
Tom Christie
cda74b5997 Merge pull request #2608 from ezheidtmann/dont-swallow-errors-in-callable-sources 
Dont swallow errors in callable sources
 2015-02-27 09:13:01 +00:00
Evan Heidtmann
e6b06c34c1 Add explanation for this exception mutation 2015-02-26 09:20:17 -08:00
Evan Heidtmann
bdb73d5588 Avoid swallowing exceptions thrown in callable attributes 2015-02-26 09:05:46 -08:00
Evan Heidtmann
16ffe5e31f Add tests for callable attributes raising exceptions 2015-02-26 09:05:37 -08:00
Tom Christie
c66f23391a Merge pull request #2572 from Ins1ne/master 
Fix UniqueTogetherValidator for NULL values
 2015-02-26 15:56:18 +00:00
Tom Christie
d219fc0d81 Merge pull request #2602 from dbrgn/fix-1602 
List resource not updated between requests
 2015-02-26 15:52:54 +00:00
Tom Christie
dafc045c2d Merge pull request #2606 from tomchristie/1.8-beta 
Formally upgrade suport to Django 1.8-beta
 2015-02-26 13:49:44 +00:00
Tom Christie
1b398a20de Who care what we do when it's totally malformed? Not me. 2015-02-26 13:41:25 +00:00
Tom Christie
4b745eef3a Update test for more graceful 1.8 handling of malformed filename encodings 2015-02-26 13:25:14 +00:00
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