Commit Graph

4627 Commits

Author SHA1 Message Date
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
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
Tom Christie
51d86a6505 Support dotted source on relational fields 2014-11-07 16:05:07 +00:00
Tom Christie
3e878a3207 Fix initial data on serializers to reflect writable fields 2014-11-07 15:38:27 +00:00
Tom Christie
02844a1507 Fix up fieldset templates. Closes #2039 2014-11-07 15:22:17 +00:00
Tom Christie
4e2627736f Merge branch 'master' into dont-deserialize-twice 2014-11-07 14:14:18 +00:00
Tom Christie
1c1c6640d2 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-07 14:13:58 +00:00
Tom Christie
55c44fc921 Fix serializer initial data 2014-11-07 14:13:50 +00:00
Tom Christie
041435f4ee Prevent re-running deserialization. Closes #1975. 2014-11-07 14:08:20 +00:00
Tom Christie
73bebbba64 Add font files 2014-11-07 12:53:01 +00:00
Tom Christie
bb21216a7c Metadata API should examine child serializer if passed parent ListSerializer. Closes #2035. 2014-11-07 12:16:25 +00:00
Tom Christie
eafb7e1e24 ModelField fix. Closes #2018. 2014-11-07 11:44:16 +00:00
Tom Christie
a16a8a10a9 .copy() for serializer .data and .errors dictionaries 2014-11-07 11:16:26 +00:00
Tom Christie
e399140031 Minor tweaks 2014-11-07 10:51:08 +00:00
Tom Christie
555930ee81 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-07 10:14:03 +00:00
Tom Christie
9b19b5a594 Serializer cleanup 2014-11-07 10:13:46 +00:00
Tom Christie
9078fd4f68 Merge pull request #2041 from asparagui/minor_sp
minor spelling tweaks
2014-11-07 08:52:11 +00:00
Brett Koonce
b44def4650 minor spelling tweaks 2014-11-06 23:19:26 -08:00
Tom Christie
a40b805963 Merge pull request #2038 from NextHub/master
Fixed base_url duplication in FileField.use_url
2014-11-06 17:37:52 +00:00
Tom Christie
db1dd8e240 Tests & fixes for list serialization 2014-11-06 17:32:33 +00:00
Tymur Maryokhin
ea76dc18b6 Fixed base_url duplication in FileField.use_url
Django already joins base_url when constructing FileField.url
2014-11-06 18:20:55 +01:00
Tom Christie
4e001dbb7a Drop usage of SortedDict. Closes #2027. 2014-11-06 12:00:30 +00:00
Tom Christie
9923a6ce90 Fix tests for py2/3 compat 2014-11-06 11:51:10 +00:00