Commit Graph

6471 Commits

Author SHA1 Message Date
Tom Christie
ea630bf3d1 Merge branch 'master' into filters 2015-08-27 14:02:15 +01:00
Tom Christie
f646b469d4 Copy tweaks 2015-08-26 13:22:18 +01:00
Tom Christie
eb37f90dcd Tweak buisiness case 2015-08-26 13:09:22 +01:00
Tom Christie
32946f4160 Tweaks to roadmap 2015-08-25 14:03:30 +01:00
Tom Christie
8264222497 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-25 13:32:42 +01:00
Tom Christie
086115c7b8 Clean up after publishing to PyPI 2015-08-25 13:32:35 +01:00
Tom Christie
3666b3f975 Merge pull request #3325 from slava-sh/patch-1
Fix typo
2015-08-24 19:45:19 +01:00
Slava Shklyaev
49d799c454 Fix typo 2015-08-24 21:09:08 +03:00
Tom Christie
1ba879278a Merge pull request #3324 from Rikuoja/master
Don't error on missing `search_fields` attribute.
2015-08-24 15:20:52 +01:00
Rikuoja
65df9fd5c6 Fix #3323 2015-08-24 17:02:49 +03:00
Tom Christie
0198bce34f Release 3.2.3 2015-08-24 10:59:52 +01:00
Tom Christie
b271946b31 Merge pull request #3321 from tomchristie/empty-charfield-html
Resolve empty HTML charfield behavior.
2015-08-24 10:41:36 +01:00
Tom Christie
9ac646385f Resolve empty HTML charfield behavior. Closes #3318. 2015-08-24 10:13:16 +01:00
Tom Christie
9758838d86 Merge pull request #3320 from jpadilla/master
Bump up maximum supported Django versions
2015-08-22 16:38:40 +01:00
José Padilla
01fa2647c9 Bump up maximum supported Django versions 2015-08-22 08:49:05 -04:00
Tom Christie
8527a2c9d2 Merge pull request #3316 from purple-sunrise/iregexp_search
Regex search option
2015-08-21 17:01:03 +01:00
borzdyko
f0782b9451 Doc for regex search filter 2015-08-21 18:26:23 +03:00
borzdyko
21d0e51831 Test for regex search filter 2015-08-21 18:23:39 +03:00
Tom Christie
5db900c625 First pass at HTML rendering for filters 2015-08-21 16:13:52 +01:00
borzdyko
314daaedfa Using https://docs.djangoproject.com/en/1.8/ref/models/querysets/#regex for search filter by starting field with '$' 2015-08-21 18:13:13 +03:00
Tom Christie
f601c6c1c3 Merge pull request #3313 from tomchristie/limit-selects
Limit rendering of relational selects to max 1000 items by default.
2015-08-21 11:41:55 +01:00
Tom Christie
c271568bf5 Remove erronous checkin 2015-08-21 10:57:46 +01:00
Tom Christie
314c0095aa iter_options function should have no cutoff by deault 2015-08-21 10:56:22 +01:00
Tom Christie
99beeb80e1 No cutoff for default ChoiceField, only for relationships 2015-08-21 10:53:10 +01:00
Tom Christie
f4412d0827 Docs for select cutoffs 2015-08-21 10:52:44 +01:00
Tom Christie
490f0c9f34 Merge branch 'callorico-master' 2015-08-20 12:39:25 +01:00
Tom Christie
b6c4d8c25a Resolve duplicate error for IPAddressField. Closes #3250. 2015-08-20 12:38:48 +01:00
Tom Christie
0f77c27d34 Merge branch 'master' of https://github.com/callorico/django-rest-framework into callorico-master 2015-08-20 12:30:33 +01:00
Tom Christie
75be91912c Allow AdminRenderer to function when pagination is disabled. Closes #3275. 2015-08-20 12:28:00 +01:00
Tom Christie
d86fd67895 Fix display of select multiple HTML fields. Closes #3290. 2015-08-20 12:11:14 +01:00
Tom Christie
b4b2dc18fa Clean-up refactoring of SearchFilter implementation 2015-08-20 11:35:32 +01:00
Tom Christie
aa4cd7e9d7 Guard against LimitOffsetPagination edge case. Closes #3303. 2015-08-20 10:12:52 +01:00
Tom Christie
1de197aa8d Tweaks for funding page 2015-08-20 10:10:06 +01:00
Tom Christie
ed65db367a Merge pull request #3300 from jpadilla/listfield-child
Raise error when `source=` use on a child.
2015-08-19 18:23:14 +01:00
José Padilla
8af366a732 Raise error when source= use on a child.
Closes #3292
2015-08-19 12:32:16 -04:00
Tom Christie
dd850df1d8 Merge pull request #3299 from kennydude/patch-1
Add import to example for filtering
2015-08-19 15:01:04 +01:00
Joe Simpson
a4af8cc623 Add import to example for filtering
`from rest_framework import filters` was missing from one of the examples
2015-08-19 14:44:40 +01:00
Tom Christie
c958d5d447 Redirect from www. to fund. when needed. 2015-08-19 12:35:23 +01:00
Tom Christie
0dc9f285be Paid plans title -> Funding 2015-08-19 12:16:00 +01:00
Tom Christie
7b0252a91c Merge pull request #3296 from FlorianHoornaar/patch-1
Fix typos in comments
2015-08-19 07:32:14 +01:00
Florian Hoornaar
1b5bc07d4c Fix typos in comments 2015-08-19 03:55:39 +02:00
koliber
2946251c91 Added explicit id field in multi update example
If the id field is implicitly created, it is created as `read_only=True`. This causes the data validation step to remove the id values in the validated data.
2015-08-18 14:47:04 +02:00
Tom Christie
bed3c45161 Merge pull request #3288 from thedrow/feature/cached-field-root-and-context
Cached the field's root and context property
2015-08-18 10:50:32 +01:00
Omer Katz
792005806b Cached the field's root and context property. 2015-08-18 12:38:13 +03:00
Tom Christie
b722b3b77a Note on bus factor 2015-08-14 13:08:54 +01:00
Tom Christie
71505e675a Flesh out the funding docs 2015-08-14 12:34:47 +01:00
Tom Christie
a0602104c3 Link to correct plans in sign up 2015-08-13 17:14:19 +01:00
Tom Christie
d80acd1f1f Initial draft of funding page 2015-08-13 14:17:27 +01:00
Tom Christie
1b53e804ee 3.2.2 Release 2015-08-13 10:23:22 +01:00
Tom Christie
0e6c467851 Merge pull request #3263 from jgadelange/master
Resolved issue with rendering of nested serializers form when value is None
2015-08-13 10:16:19 +01:00