Commit Graph

4893 Commits

Author SHA1 Message Date
Tom Christie
fd980be39b Documentation in 'many_init' docstring. Refs #2120. 2014-11-25 10:39:58 +00:00
Tom Christie
9c58dfec4e Fix shoddy test case 2014-11-25 10:34:21 +00:00
Tymur Maryokhin
b6de2660ea Added python 3.2 to test against django master . Related to #2075. 2014-11-25 11:09:36 +01:00
Tymur Maryokhin
1fcb495456 Updated travis config 2014-11-25 10:58:03 +01:00
Tymur Maryokhin
585054f012 Streamlined tox config with 1.8 features 2014-11-25 10:57:46 +01:00
BrickXu
7165496732 Merge pull request #1 from tomchristie/master
Merge upstream
2014-11-25 17:40:32 +08:00
Tom Christie
ecc26f6cb1 Style tweaks to login template. 2014-11-25 09:07:25 +00:00
Tom Christie
735d2257b4 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-25 08:59:59 +00:00
Tom Christie
bdacb66244 Lowercase HTML label tag. Refs #2121. 2014-11-25 08:59:45 +00:00
Tom Christie
3371131a61 Merge pull request #2116 from LuRsT/patch-5
Fixed database update instructions
2014-11-24 13:21:15 +00:00
Xavier Ordoquy
eb77de4bdd Merge pull request #2117 from LuRsT/patch-6
Added missing import in tutorial snippet
2014-11-24 10:08:49 +01:00
Gil Gonçalves
918b9cc6a6 Added missing import in tutorial snippet 2014-11-24 08:54:07 +00:00
Gil Gonçalves
790a651893 Fixed database update instructions 2014-11-24 08:51:08 +00:00
Tom Christie
5cad60dc4f Merge pull request #2115 from hgiasac/master
Fix typo "serailizers" to  "serializers"
2014-11-23 19:59:06 +00:00
Tony Nguyen
c94d1e6d3e Fix typo "serailizers" to "serializers" 2014-11-23 22:40:40 +07:00
Tom Christie
f7de442ef4 Merge pull request #2112 from rinti/patch-1
remove sponsored by dabapps
2014-11-21 21:46:01 +00:00
Andreas Bernacca
2ec0e7417f removed the whole footer section 2014-11-21 22:45:28 +01:00
Tom Christie
e6ecb494bb Merge pull request #2111 from matthewwithanm/perm-docs
Clarify how permission classes are composed
2014-11-21 21:43:22 +00:00
Andreas Bernacca
fe9a758d7e remove sponsored by dabapps 2014-11-21 22:15:43 +01:00
Matthew Dapena-Tretter
8e940a22fb Clarify how permission classes are composed
all/every/AND or any/OR? all/every/AND!
2014-11-21 16:04:45 -05:00
Tom Christie
5b671cb515 Fix rendering HTML form when API error raised. Closes #2103. 2014-11-20 16:14:51 +00:00
Tom Christie
d037c53b57 Merge pull request #2095 from tomchristie/3.0-beta
3.0 beta
2014-11-20 14:32:37 +00:00
Tom Christie
1aa58d16be Py3 fix - .items is not a list. 2014-11-20 14:26:40 +00:00
Tom Christie
071c064d25 Fill in TODOs for 3.0 beta release notes 2014-11-20 14:22:53 +00:00
Tom Christie
6a2023a362 Note on 3.1 and 3.2 releases. 2014-11-20 13:52:00 +00:00
Tom Christie
d80d58e91a Merge branch 'master' into 3.0-beta 2014-11-20 13:44:35 +00:00
Tom Christie
6ec96d0bac Resolve PUT and POST buttons in browsable API 2014-11-20 13:43:38 +00:00
Tom Christie
9c6bead8b6 Add --- null option for selects. Closes #2096. 2014-11-20 12:38:08 +00:00
Tom Christie
6794b3380a Fixes for defaulting empty HTML fields to '', None, or empty. 2014-11-20 12:15:33 +00:00
Tom Christie
7d417fc678 Make _force_text_recursive private. 2014-11-20 12:02:58 +00:00
Tom Christie
096c58b784 Merge branch 'master' into 3.0-beta 2014-11-20 11:51:42 +00:00
Tom Christie
37312eed21 Merge pull request #2100 from LuRsT/patch-1
Removed unused import from code snippet in tutorial
2014-11-20 11:43:35 +00:00
Gil Gonçalves
04d2635b24 Removed unused import from code snippet in tutorial 2014-11-20 11:33:42 +00:00
Tom Christie
9b4757b7af Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-20 09:31:01 +00:00
Tom Christie
bde7255413 Fix non-determanistic default bug. Closes #2099. 2014-11-20 09:30:49 +00:00
Tom Christie
8df6645012 Merge pull request #2097 from raonyguimaraes/master
small type
2014-11-19 16:07:46 +00:00
Raony Guimarães
928cbc640e small type 2014-11-19 13:53:36 -02:00
Tom Christie
40b1ea919b Fix non-determanistic unique constraint mapping. Refs #2092. 2014-11-19 14:51:49 +00:00
Tom Christie
8516281078 Minor fix for #2092. 2014-11-19 14:40:30 +00:00
Tom Christie
bc83dfece4 Merge branch 'master' into 3.0-beta 2014-11-19 14:04:31 +00:00
Tom Christie
51b7033e4a Further notes in 3.0 announcement 2014-11-19 14:03:19 +00:00
Tom Christie
8586290df8 Apply defaults and requiredness to unique_together fields. Closes #2092. 2014-11-19 13:55:10 +00:00
Tom Christie
6cb6510132 Use translatable error strings. Refs #2063. 2014-11-19 12:15:05 +00:00
Tom Christie
3eaf92e893 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-19 09:31:38 +00:00
Tom Christie
e49d22dbda Allow blank choices to render. Closes #2071. 2014-11-19 09:31:26 +00:00
Xavier Ordoquy
8df3740ad5 Merge pull request #2090 from joshk/patch-1
Use the new build env on Travis
2014-11-19 01:24:02 +01:00
Josh Kalderimis
5cda5ad18e Use the new build env on Travis
faster vms, more ram, more cpu, better vm boot times

official docs coming soon
2014-11-18 13:06:08 -05:00
Tom Christie
f573aaee4e List serializer no explicitly renders as 'not supported for HTML input' 2014-11-18 17:25:05 +00:00
Tom Christie
f269826a7d Note on 3.0 beta 2014-11-18 16:26:45 +00:00
Tom Christie
c0d356edaa Fix byte decode error rendering 'display_name' with OPTIONS. Closes #2084 2014-11-18 15:42:52 +00:00