encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-04 23:44:07 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,165 Commits 18 Branches 132 Tags 105 MiB
32bd1a2f0b
Commit Graph

6165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Yong
000db8df18 Fix typo in versioning docs 2015-03-17 11:36:02 -06:00
Tom Christie
74506ba8ed Merge pull request #2705 from diwu1989/patch-1 
use SAFE_METHODS and make tuple
 2015-03-17 09:04:44 +00:00
Di Wu
48e1f151c5 use SAFE_METHODS and make tuple 2015-03-16 22:13:07 -07:00
Tom Christie
2e55d15d4d Merge pull request #2703 from kylepjohnson/master 
Add necessary imports to final urls.py example
 2015-03-16 15:33:00 +00:00
Tom Christie
53bb4832d3 Merge pull request #2702 from rubendura/master 
Updates ducumentation DEFAULT_PAGE_SIZE left over after #2655
 2015-03-16 15:18:43 +00:00
Kyle P. Johnson
d655a423fb Add necessary imports to final urls.py example 2015-03-16 11:17:02 -04:00
Rubén Durá Tarí
ac44bae90d Updates ducumentation DEFAULT_PAGE_SIZE left over after #2655 2015-03-16 14:53:26 +00:00
Tom Christie
2148f32007 Merge pull request #2700 from tomchristie/do-not-paginate-if-page-size-none 
Do not paginate if PAGE_SIZE=None
 2015-03-16 12:15:50 +00:00
Tom Christie
992971d648 Merge pull request #2631 from Ins1ne/feature/issue-2559 
Allow blank/null on radio.html choices
 2015-03-16 12:11:33 +00:00
Tom Christie
5cd0714dca Do not paginate if PAGE_SIZE=None 2015-03-16 12:05:31 +00:00
Tom Christie
4cd49d5de3 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-03-16 11:57:42 +00:00
Tom Christie
c573e7b4a8 Latest translation strings 2015-03-16 11:57:28 +00:00
Tom Christie
1c0db6dda8 Merge pull request #2697 from jpadilla/tests 
Simplify test settings
 2015-03-16 09:18:08 +00:00
José Padilla
76ede5beda Simplify test settings 2015-03-14 15:57:22 -04:00
Ion Scerbatiuc
022c4d540b Refactored DecimalField to allow easier subclassing 2015-03-14 07:16:17 -07:00
Tom Christie
b41808b79a Merge pull request #2691 from mochawich/patch-1 
fixed missing anchor closing tag
 2015-03-13 16:14:12 +00:00
mochawich
2266fec99d fixed missing anchor closing tag 
when next_url is none, big part of page html will be rendered under the <a href='#'> as it does not have a closing tag.
 2015-03-13 17:03:51 +01:00
Xavier Ordoquy
cc64e30f55 Merge pull request #2685 from rbarrois/rbarrois/fix_lookup_url_kwarg 
Fix lookup_url_kwarg handling in viewsets (Fixes #2591).
 2015-03-13 07:49:14 +01:00
Raphaël Barrois
8d0dbc8092 Fix lookup_url_kwarg handling in viewsets. 
The ``lookup_url_kwarg`` is intended to set the name of a field in the
URL regexps when using custom ``lookup_field``, but the routers ignore
it altogether.
 2015-03-13 01:07:20 +01:00
Xavier Ordoquy
a02098b855 Fix the link to the old doc (#2681). 2015-03-13 00:15:53 +01:00
José Padilla
36e30c8f91 Merge pull request #2678 from vikingco/fix/ugettext-in-pagination 
Fixed problem with imporing rest_framework.views in apps.py
 2015-03-12 11:52:43 -04:00
Dirk Moors
6c1d0d7ed0 Fixed problem with imporing rest_framework.views in apps.py 2015-03-12 16:36:26 +01:00
José Padilla
ff35b971d3 Merge pull request #2671 from esmail/patch-2 
Fix example of explicit format URL (for real).
 2015-03-11 12:03:12 -04:00
Esmail
2484dbf4e1 Fix example of explicit format URL (for real). 
Do what I meant to do in #2670:

The link is displayed in the tutorial as "http://example.com/api/items/4.json" but the hyperlink itself and what the example code actually works with are (in my opinion, less pretty) URLs like "http://example.com/api/items/4/.json".
 2015-03-11 12:00:19 -04:00
Xavier Ordoquy
42ee8e147c Merge pull request #2668 from Maplecroft/doc_fixes 
Fix for minor documentation typo
 2015-03-11 12:29:54 +01:00
James Rutherford
7854c939dd Fixed import statement in API docs 2015-03-11 10:44:42 +00:00
James Rutherford
4a2d27975a Merge pull request #1 from tomchristie/master 
Merge in from upstream
 2015-03-11 10:38:03 +00:00
José Padilla
dc56e5a0f4 Merge pull request #2666 from balsdorf/patch-1 
Changed incorrect class name in pagination docs
 2015-03-10 19:01:50 -04:00
Bryan Alsdorf
69b6e26f06 Changed incorrect class name 2015-03-10 17:30:41 -05:00
Xavier Ordoquy
3e44f788b1 Fixed a typo in the documentation's link. 2015-03-09 17:28:00 +01:00
Tom Christie
e520ea0acb Merge pull request #2652 from jpadilla/master 
Remove the 'docs for 3.0' banners.
 2015-03-09 08:53:13 +00:00
Tom Christie
d46d860088 Merge pull request #2655 from jwbixby/patch-1 
Update documentation over PAGE_SIZE
 2015-03-09 08:50:29 +00:00
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
jwbixby
c2cbda43b9 Update documenation over PAGE_SIZE 
This replaces all locations of the old setting `DEFAULT_PAGE_SIZE` for the current setting `PAGE_SIZE`
 2015-03-08 00:22:28 -05:00
José Padilla
140b94c32e Update to 3.1 release 2015-03-07 10:50:31 -04:00
José Padilla
d12de927ad Remove docs for 3.0 banners 2015-03-07 10:49:56 -04:00
José Padilla
2ddb6bfa70 Fix permissions on markdown files 2015-03-07 10:19:25 -04:00
Aider Ibragimov
7159b31023 update vertical and inline layouts for radio choices 2015-03-07 07:17:22 +03: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