Commit Graph

4508 Commits

Author SHA1 Message Date
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
Tom Christie
080bd3d24e Add comment ref #2089 2014-11-18 15:38:31 +00:00
Tom Christie
084354d3eb Only pass instance to form for PUT and PATCH. Closes #2073. 2014-11-18 15:11:40 +00:00
Tom Christie
5e74f02d61 Note removal of 'save_object' and fail loudly if it exists 2014-11-18 14:49:00 +00:00
Tom Christie
0f508c5821 Docs for advanced default argument usage. Closes #1945 2014-11-17 18:36:32 +00:00
Tom Christie
d2537e51a5 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-17 18:17:59 +00:00
Tom Christie
5f580cad52 Remove class='form-control' for file inputs. Closes #2065. 2014-11-17 18:17:44 +00:00
Tom Christie
2444e6a793 Merge pull request #2083 from jpadilla/patch-1
Fix runtests examples
2014-11-17 12:42:08 +00:00
José Padilla
d08cfb0559 Fix runtests examples
Correctly rename runtests examples to work with current runtests.py file.
2014-11-17 08:17:40 -04:00
Tom Christie
a190ffda3c Merge pull request #2082 from tomchristie/add-django-master-to-build-matrix
Add Django `master` to build matrix.
2014-11-17 10:04:05 +00:00
Tom Christie
b001a146d7 Add django master to build matrix. Closes #2075. 2014-11-17 09:56:20 +00:00
Tom Christie
4e03518438 required=False for nullable relationships 2014-11-13 23:30:42 +00:00
Tom Christie
7394dcec9e ReturnList and ReturnDict wrapped at nicer point 2014-11-13 23:05:44 +00:00
Tom Christie
cb672a0ecb Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-13 22:16:53 +00:00
Tom Christie
992330055e Refactor many 2014-11-13 21:11:13 +00:00
Tom Christie
78a741be27 Split out .create and .update on ListSerializer 2014-11-13 20:24:48 +00:00
Tom Christie
fd97d9bff8 Use select inputs for relationships. Closes #2058. 2014-11-13 19:35:03 +00:00
Tom Christie
ea98de9b88 Model fields with .blank or .null now map to required=False. Closes #2017. Closes #2021. 2014-11-13 19:28:57 +00:00
Tom Christie
9e75c4d8ea Reinstate OPTIONS tests 2014-11-13 16:24:03 +00:00
Tom Christie
502a86cedb Remove tests/settings. Using conftest instead. 2014-11-13 16:10:48 +00:00
Tom Christie
e5cd693e7b Remove test cruft 2014-11-13 16:07:25 +00:00
Tom Christie
03310cc33a Add PyPI version badge. 2014-11-13 12:06:45 +00:00
Tom Christie
e70b82b6c8 Update html.py 2014-11-12 15:38:39 +00:00
Tom Christie
1838e18aee Update html.py 2014-11-12 15:38:05 +00:00
Tom Christie
3e8068757b Merge pull request #2055 from kevinlondon/patch-6
#2054: Update exceptions to allow custom detail
2014-11-10 20:04:34 +00:00
Kevin London
9521b69711 #2054: Update exceptions to allow custom detail
This addresses the changes requested in #2054 and allows for custom messages that do not necessarily require a string formatter be present in the detail message.
2014-11-10 11:08:39 -08:00