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
Carlton Gibson
c50a42bddc
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2014-11-18 16:42:39 +01: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
Doug Beck
67735687b2
Ensure _resolve_model
does not return None
2014-11-18 01:26:23 -05: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
Gregor Müllegger
ad060aa360
More helpful error message when default .create
fails. Closes #2013 .
2014-11-15 15:29:52 +01: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
Kevin Chang
dbb435ca31
Added missing default style for FileField
2014-11-12 12:46:09 -08: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
Tom Christie
62ce653c61
Update fields.py
2014-11-10 14:44:26 +00:00
Tom Christie
fd7db776ad
Bring UniqueValidator implementation in line with other uniquness validators.
2014-11-10 12:32:03 +00:00
Tom Christie
8c1fa0b87d
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-11-10 12:21:41 +00:00
Tom Christie
f387cd89da
Uniqueness constraints imply a forced 'required=True'. Refs #1945
2014-11-10 12:21:27 +00:00
Tom Christie
ab1d4364b6
Merge pull request #2051 from jochenvdv/fix-typos
...
Fix some typos in contributing.md
2014-11-08 11:57:51 +00:00
Jochen Van de Velde
440d61ab36
Fix some typos and other errors
2014-11-08 11:02:48 +01:00
Tom Christie
fec0e56ffb
Merge pull request #2050 from jpadilla/issues/2045
...
Fix csrf-ajax link
2014-11-08 07:47:47 +00:00
José Padilla
058fea23d3
Fix csrf-ajax link. Closes #2045
2014-11-07 23:55:42 -04:00
Tom Christie
93633c297c
Tweaks to release notes
2014-11-07 20:44:12 +00:00
Tom Christie
59b30307e8
Fixes to release notes
2014-11-07 20:10:15 +00:00