Martin Hill
bac6f1fcf4
check if field.to_fields is None
2015-11-14 18:26:29 -05:00
Martin Hill
e475464945
fix for issue #3634
2015-11-14 17:00:07 -05:00
Ryan Hiebert
fe12816b82
Move default validation back into init method
2015-11-13 15:16:27 -06:00
Denis Cornehl
3806af3d15
allow setting a custom Django Paginator in pagination.PageNumberPagination
2015-11-13 16:04:12 +01:00
d6bels
82eb4c8d71
Login form autofocus
2015-11-11 10:51:20 +01:00
Michael J. Schultz
abc6fa05e6
Markdown 2.1 compatible
2015-11-09 11:47:00 -06:00
Ryan Hiebert
f2452936e9
Allow no queryset when get_queryset overridden
...
The user may wish to provide a dynamic queryset on a `RelatedField`
based on the `context`. The way to do that is to create a subclass of
`RelatedField` (or a child) and override the `get_queryset` method.
However, this is undocumented, and instantiating that field without a
`queryset` argument (because it's not needed) will raise an assertion
error.
Document `.get_queryset(self)` as an official part of the API of
`RelatedField`, and don't enforce the use of `queryset` when
`get_queryset` is overridden.
2015-11-05 17:34:02 -06:00
Michael J. Schultz
b2e74fb523
Use markdown 2.6 extension_configs to configure extension
2015-11-05 10:52:31 -06:00
Michael J. Schultz
d9d34e4886
Use full python dot path to extension
2015-11-05 10:48:19 -06:00
Michael J. Schultz
276bc3bc2b
Remove safe_mode since it is not safe.
2015-11-05 10:47:56 -06:00
nfletton
f85ad301eb
Fix regression causing raw data form to not display
2015-11-04 15:43:25 -07:00
Tom Christie
33b512b1f2
Version 3.3.1
2015-11-04 14:49:57 +00:00
Tom Christie
544c24e7cb
Merge pull request #3593 from tomchristie/primary-key-check-for-to-field
...
Proper 'primary key' checking on to_fields.
2015-11-04 14:49:11 +00:00
Tom Christie
54b79db214
Proper 'is primary key' checking
2015-11-04 14:37:32 +00:00
Tom Christie
95f92e995c
Merge pull request #3560 from ericholscher/fix-empty-filter
...
Allow HTML to render when no filter_class is defined.
2015-11-04 14:20:03 +00:00
Tom Christie
bfdf795843
Merge pull request #3592 from tomchristie/request-parsing-when-post-accessed
...
Request parsing when .POST accessed
2015-11-04 14:17:55 +00:00
Tom Christie
d587ad1021
Use REST framework request parsing when accessing old-style .POST
2015-11-04 14:10:51 +00:00
Xavier Ordoquy
ce491b3424
Merge pull request #3568 from jpadilla/decimal-validator
...
Add compat util for DecimalValidator
2015-10-30 12:54:08 +01:00
José Padilla
08e4a98822
Merge pull request #3564 from mcastle/patch-1
...
Fix trans template tag error on admin
2015-10-30 06:29:25 -04:00
JocelynDelalande
3b25207099
typo
2015-10-29 16:20:44 +01:00
José Padilla
41d1e42e9c
Add compat util for DecimalValidator
2015-10-29 06:42:16 -04:00
Marlon
3c6ce9dfc0
Fix trans template tag error
...
Trans template tag requires `{% load i18n %}` at top of template.
2015-10-28 22:47:52 -05:00
Eric Holscher
32bd1a2f0b
Use better names for filter variable
2015-10-28 14:36:24 -07:00
Eric Holscher
378d6a1a19
Allow HTML to render when no filter_class is defined.
...
Previously it required a filter_class,
or else it would error when calling `cls()`.
This now sets the `filter` context to `None`
if one does not exist.
Fixes #3559
2015-10-28 12:39:20 -07:00
Rense VanderHoek
0d568ed59f
format_html was missing in optional_logout template-tag
...
The new format_html() was still missing in optional_logout template-tag
at the NoReverseMatch exception.
2015-10-28 18:48:58 +01:00
José Padilla
b8c9c809ff
Merge pull request #3547 from nikolas/bootstrap-3.3.5
...
Update bootstrap from 3.2.0 to 3.3.5
2015-10-28 09:42:01 -04:00
Tom Christie
bb555e6e5e
Version 3.3.0
2015-10-28 11:32:15 +00:00
Tom Christie
fa6f053323
Merge pull request #3544 from dursk/nested-as-form-fields
...
Correctly handle False in NestedBoundField.as_form_field()
2015-10-27 16:55:36 +00:00
Nik Nyby
8c6ded38de
Update bootstrap from 3.2.0 to 3.3.5
2015-10-26 10:40:59 -04:00
José Padilla
21cad8646a
Use format_html in tags that generate HTML
2015-10-25 08:31:28 -04:00
Matthew Madurski
8aed3d4862
Correctly handle false in nested as_form_field
2015-10-24 19:48:17 -04:00
Tom Christie
84e9013417
Merge pull request #3531 from tomchristie/version-3.3
...
Version 3.3
2015-10-23 16:24:08 +01:00
Tom Christie
0fb1ebcfcf
Remove unused import
2015-10-23 16:07:48 +01:00
José Padilla
d64bfef56a
Map all supported FilePathField options
2015-10-23 10:08:29 -04:00
auvipy
fa93d79026
removed south_migrations directory
2015-10-23 10:00:01 -04:00
auvipy
b71e6b596f
removed south migrations
2015-10-23 10:00:00 -04:00
Tom Christie
cf33008571
Release notes etc
2015-10-22 14:05:52 +01:00
Tom Christie
c53c9eddfe
Merge pull request #3315 from tomchristie/filters
...
First pass at HTML rendering for filters
2015-10-22 11:42:35 +01:00
Tom Christie
0c6d46729c
Docs on the filter HTML interface
2015-10-22 11:37:27 +01:00
Tom Christie
6305ae8916
Merge pull request #3475 from tomchristie/forms-api
...
Forms API
2015-10-22 09:59:57 +01:00
likeon
322bda8159
Added support for the to_field on ForeignKey fields
2015-10-21 15:33:18 +03:00
Dawn Pattison
8fa7c5c914
Exclude collections.Mapping from allowable data types in ListField
2015-10-20 08:56:39 -04:00
Tom Christie
34eb18b498
Merge branch 'master' into filters
...
Conflicts:
rest_framework/compat.py
rest_framework/filters.py
2015-10-19 13:14:42 +01:00
Omer Katz
2e178bc970
Replaced all dict and set conversions from lists to dict and set literals.
2015-10-17 12:00:11 +03:00
Dawn Pattison
dac1637bb3
Use set instead of Set
2015-10-16 16:06:18 -04:00
Dawn Pattison
b9316154b1
Add tuple and Set to allowed ListField data types
2015-10-16 16:02:13 -04:00
Dawn Pattison
f808f08a0d
Require that data is a list.
2015-10-16 14:43:43 -04:00
José Padilla
a1dad503cf
Map TextField max_length to CharField
2015-10-16 07:17:33 -04:00
Xavier Ordoquy
1b4a41cb80
Merge pull request #3502 from auvipy/master
...
removed south migrations
2015-10-15 10:41:07 +02:00
auvipy
4db2501399
removed south_migrations directory
2015-10-15 14:17:56 +06:00
auvipy
392df94693
removed south migrations
2015-10-15 14:16:35 +06:00
Aider Ibragimov
79008ea210
fix typo for adding jquery string in AdminRenderer
2015-10-14 15:56:26 +03:00
Aider Ibragimov
5342f22009
return typo back for new pr, update docs
2015-10-14 15:54:43 +03:00
Aider Ibragimov
b19865f88d
fix typo in adding jquery string, update docs about detail page link for AdminRenderer
2015-10-14 15:14:35 +03:00
Tom Christie
90247afe29
Docs on Forms API
2015-10-12 21:14:58 +01:00
Dulmandakh
431ac45168
Update compat.py
...
try to import guardian if it's in INSTALLED_APPS
2015-10-09 11:03:19 +08:00
Tom Christie
41182c6f06
Formns API
2015-10-06 10:58:20 +01:00
Marlon
670b0b710b
Use serializers.ValidationError
...
Per django rest framework docs, and to prevent confusion with Django's ValidationError, `serializers.ValidationError` is preferred to `exceptions.ValidationError`.
2015-09-30 21:09:37 -05:00
Philippe Ombredanne
3262ee6c90
Fixed minor doc typo.
2015-09-29 21:59:09 +02:00
Tom Christie
265ec8ac62
Handle binary or unicode with JSONField
2015-09-28 17:47:51 +01:00
Tom Christie
ec8098b7e2
Work around 2.x/3.x json.dumps() return type fuzziness
2015-09-28 17:32:36 +01:00
Tom Christie
10dbf1316f
Added JSONField. Closes #3170 .
2015-09-28 17:25:52 +01:00
Tom Christie
bae47b7f36
Merge pull request #3453 from tomchristie/remove-content-overriding
...
Remove content overriding
2015-09-28 16:42:42 +01:00
Tom Christie
c64896c849
More cleanup of browser overrides
2015-09-28 15:33:55 +01:00
Tom Christie
d7142e23ac
Merge branch 'master' into remove-content-overriding
2015-09-28 15:15:50 +01:00
Tom Christie
02e1f69d2b
Django 1.9 support
2015-09-28 11:44:07 +01:00
Tom Christie
2d0b54e263
Merge branch 'drop-django-16' oft https://github.com/carltongibson/django-rest-framework into carltongibson-drop-django-16
...
Conflicts:
docs/topics/release-notes.md
2015-09-28 11:17:48 +01:00
Tom Christie
ca8313aeac
Merge branch 'master' into version-3.3
...
Conflicts:
docs/topics/release-notes.md
2015-09-28 10:57:14 +01:00
Tom Christie
6284bceaaf
Merge pull request #3363 from tomchristie/dont-access-settings-on-import
...
Access settings lazily, not at module import.
2015-09-24 15:42:31 +01:00
Stian Jensen
62c000bc12
Use model error_messages when available
...
In the automatically applied UniqueValidator, use the error message from
error_messages defined in the model instead of the generic default
UniqueValidator message.
This fixes #2878 .
2015-09-23 15:20:44 +02:00
Tom Christie
51443166a8
Merge pull request #3431 from paolopaolopaolo/issue-3265
...
Guard against calling `serializer.data` before `serializer.save()`
2015-09-23 09:51:54 +01:00
paolopaolopaolo
7640bfea9e
Add assert
statement to .save()
method in Serializer:
...
- Asserts that `_data` does not exist when calling `.save()`
2015-09-22 11:49:51 -07:00
Carlton Gibson
45ace5010e
Remove OrderedDict fallback
2015-09-22 16:35:38 +02:00
Carlton Gibson
0b34408172
Remove unittest.skipUnless
2015-09-22 16:24:22 +02:00
Carlton Gibson
6e86a53c92
Remove apps.get_model
fallback
...
* Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests`
2015-09-22 16:14:45 +02:00
Carlton Gibson
68c88e180f
Remove ContentType import fallback
2015-09-22 15:55:39 +02:00
Carlton Gibson
8ea1606abf
Remove Django 1.5 clean_manytomany_helptext fallback
2015-09-21 20:16:52 +02:00
Carlton Gibson
25de8c960f
Remove Django 1.5 get_model_name fallback
2015-09-21 20:10:31 +02:00
Carlton Gibson
4a1ab3c18c
Fix isort errors
2015-09-21 16:29:33 +02:00
Carlton Gibson
e625cff8a5
Remove Django 1.5 URLValidator fallback
2015-09-21 16:22:46 +02:00
Carlton Gibson
9216dc9a25
Remove Django 1.5 EmailValidator fallback
2015-09-21 16:20:07 +02:00
Xavier Ordoquy
26715c2dae
Merge remote-tracking branch 'origin/master' into release/3.2.4
2015-09-21 13:25:49 +02:00
Xavier Ordoquy
f2c65512c6
Merge pull request #3415 from adamsc64/issue_2761
...
Fixed #2761 - ListField truncation on HTTP PATCH
2015-09-21 13:06:44 +02:00
Xavier Ordoquy
089b8af4c1
Update the translations.
2015-09-21 08:07:56 +02:00
Xavier Ordoquy
d0510438b2
Bump version to 3.2.4.
2015-09-20 22:04:25 +02:00
Xavier Ordoquy
df26614e85
Translation update.
2015-09-20 21:59:47 +02:00
Christopher Adams
9ccfc94077
Fixed #2761 - ListField truncation on HTTP PATCH
...
- Checked ``partial`` state when getting value in appropriate field
classes; return ``empty`` immediately if key not submitted.
2015-09-19 10:18:04 -04:00
Tom Christie
eec1156f63
AJAX forms in admin interface
2015-09-17 16:53:28 +01:00
Tom Christie
343fd5ec3d
Merge branch 'canassa-method-not-allowed-not-raised' into remove-content-overriding
2015-09-17 16:39:30 +01:00
Tom Christie
4b4130e8b2
Fix request cloning, so method becomes set
2015-09-17 16:34:03 +01:00
Tom Christie
a3067bea55
Merge branch 'master' into version-3.3
2015-09-17 16:24:46 +01:00
Tom Christie
566812ac0b
Remove method and content overriding
2015-09-17 15:17:29 +01:00
Steven Loria
284f9faa07
Correctly handle [] and {} as invalid inputs to BooleanField
2015-09-11 23:12:18 -04:00
Xavier Ordoquy
4404d40f60
Only pass allow_empty to the ListSerializer
if it was in the arguments.
...
Helps with backward compatibility.
2015-09-06 23:02:44 +02:00
Tom Christie
f9e53091c1
Drop handling of ImproperlyConfigured
2015-09-03 16:40:12 +01:00
Tom Christie
8b7ebb9d2c
Fixed import sorting
2015-09-03 16:29:13 +01:00
Xavier Ordoquy
dcdd765647
Avoid passing allow_empty to the ListSerializer children.
2015-09-03 17:27:33 +02:00
Tom Christie
10da18b20b
Access settings lazily, not at module import
2015-09-03 16:24:13 +01:00
Tom Christie
39ec564ae9
Do not access settings on compat import
2015-09-03 14:22:13 +01:00
Tom Christie
e9e88cbc60
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2015-09-03 11:24:07 +01:00
Tom Christie
f9d1a34fdd
Fix nested HTML dictionaries. Closes #3314 .
2015-09-03 11:23:58 +01:00
Tom Christie
afd2a8f8f0
Adjust ModelField.null mappings now that Django-25320 is resolved
2015-09-03 10:12:52 +01:00
raphaelmerx
b9782b6850
DurationField accepts integers
2015-09-02 16:47:50 -07:00
Tom Christie
f87573ffa3
Merge pull request #3345 from jpadilla/fields
...
Update ModelSerializer 'fields'/'exclude'/'__all__' behavior
2015-08-28 14:57:05 +01:00
Tom Christie
f34777a2e9
Translations for HTML filters
2015-08-28 14:55:22 +01:00
Tom Christie
78632849cf
Comment against model_field.null 1.98 behavior
2015-08-28 13:29:57 +01:00
Tom Christie
8db6367188
Deal with 1.9's differing null behavior on reverse relationships and m2m
2015-08-28 12:08:32 +01:00
Tom Christie
b51c1ff0b0
Django 1.9's test case HttpResponse.json() is not cachable.
2015-08-28 11:55:23 +01:00
Tom Christie
a5ddd90df0
Log in and log out require escape and mark_safe
2015-08-28 10:27:49 +01:00
Tom Christie
24a2c3f5c3
Resolve unittest compat
2015-08-28 10:19:18 +01:00
Tom Christie
e70da5ac6b
Compat for GenericForeignKey, GenericRelation
2015-08-28 10:03:08 +01:00
José Padilla
654e0e4527
Update ModelSerializer fields behavior
2015-08-27 13:09:08 -04:00
Tom Christie
4f27697467
Fix get_model import
2015-08-27 17:28:12 +01:00
Tom Christie
48540f180a
unittest compat fallback
2015-08-27 17:11:53 +01:00
Tom Christie
0b77e733a8
Don't display filter control on detail views
2015-08-27 14:35:39 +01:00
Tom Christie
9bcb1477e2
Minor tweaks
2015-08-27 14:28:28 +01:00
Tom Christie
aeb57913c9
Filter HTML refinments
2015-08-27 14:25:44 +01:00
Tom Christie
ea630bf3d1
Merge branch 'master' into filters
2015-08-27 14:02:15 +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
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
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
b6c4d8c25a
Resolve duplicate error for IPAddressField. Closes #3250 .
2015-08-20 12:38:48 +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
José Padilla
8af366a732
Raise error when source=
use on a child.
...
Closes #3292
2015-08-19 12:32:16 -04:00
Omer Katz
792005806b
Cached the field's root and context property.
2015-08-18 12:38:13 +03:00
Ollie Walsh
332c30afb9
Lint
2015-08-14 12:20:25 +01:00
Ollie Walsh
3d0292e1cd
Do not ignore overridden View.get_view_name() in breadcrumbs
2015-08-14 12:16:57 +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
Tom Christie
18af181191
Fix boolean checkboxes setting to False. Closes #3258 . Closes #2776 .
2015-08-13 09:56:03 +01:00
Jeffrey de Lange
f5a9904cc8
Resolved issue with rendering of nested serializers form when value is None
2015-08-11 20:27:41 +02:00
Tom Christie
a3e64fbe0d
Resolve issue with rendering nested serializer forms with empty values. Closes #3260 .
2015-08-11 16:25:02 +01:00
Tom Christie
0df99a6c95
Fix erronous request.files docs, and incorrect request.FILES behavior. Closes #3261 .
2015-08-11 16:21:02 +01:00
Tom Christie
b7e47e3d67
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2015-08-11 09:24:16 +01:00
Tom Christie
83e49dbe63
Fix checkbox input display. Refs #3258 .
2015-08-11 09:23:49 +01:00
Tom Christie
4509dbc24e
Merge pull request #3241 from jpadilla/master
...
Raise error if passed a serializer instance
2015-08-10 17:41:01 +01:00
James Beith
5c0a2b79b3
Remove converting a string in to a string
...
The `display_value` method returns a text type.
2015-08-10 15:33:04 +01:00
James Beith
2f6e5d0509
Add display value method
...
Returns the text representation of the instance. Subclasses can override this method to provide a different display value used for populating the `choices` property.
2015-08-10 11:03:57 +01:00
José Padilla
7a0416c50b
Raise error if passed a serializer instance
2015-08-07 13:12:37 -04:00
Tom Christie
0cbfbc27d8
Tweak erronous assignment
2015-08-07 15:41:46 +01:00
Tom Christie
3ea394dbff
Version 3.2.1
2015-08-07 14:55:18 +01:00
Tom Christie
368fb9fb2a
Merge pull request #3238 from kezabelle/bugfix/3235
...
Fixed #3235 - ListField now returns the QueryDict value even if it's a list of only one item.
2015-08-07 14:44:32 +01:00
Tom Christie
65e1c938eb
Fix for 1, 0 being rendered as true, false in the admin. Closes #3227 .
2015-08-07 14:38:36 +01:00
Tom Christie
e63dcab8b3
Fix for rendering select templates on relationships
2015-08-07 14:36:00 +01:00
Tom Christie
88609ba3a3
Merge branch 'master' of github.com:tomchristie/django-rest-framework
2015-08-07 14:24:37 +01:00
Tom Christie
19c1976fcc
Leave requests.FILES alone, for compat with regular Django requests. Closes #3239 .
2015-08-07 14:24:28 +01:00
Keryn Knight
0078f66104
Fixed #3235 - A querydict which yields a list with only one value now correctly returns the provided data.
2015-08-07 11:43:17 +01:00
Tymur Maryokhin
4e5da16961
Remove Django 1.4 compat code
2015-08-07 00:02:29 +02:00
Tom Christie
67ddd54a89
Merge pull request #3226 from tomchristie/version-3.2
...
Version 3.2
2015-08-06 14:30:46 +01:00
Tom Christie
b4f1a8a367
Update translations
2015-08-06 13:22:53 +01:00
Tom Christie
78053c7e6c
Upgrade version to 3.2.0
2015-08-06 13:18:51 +01:00
Tom Christie
24dec32e7a
Added test_iter_options
2015-08-06 12:18:09 +01:00
Tom Christie
4d69286efa
Use same structure for both .choices and .grouped_choices
2015-08-06 12:03:38 +01:00
Tom Christie
a6fefe78ff
Added docstring
2015-08-06 11:44:39 +01:00
Tom Christie
27ac5a3680
Support grouped choices
2015-08-06 11:43:03 +01:00
Tom Christie
95a1550388
Merge branch 'grouped-choices-fix' of https://github.com/maxpeterson/django-rest-framework into maxpeterson-grouped-choices-fix
2015-08-06 10:04:52 +01:00
Tom Christie
38a1b3ec6b
Rationalize decimal logic. Closes #3222 .
2015-08-06 09:51:00 +01:00
Tom Christie
f7d44dfae0
Loud errors on request.DATA et al.
2015-08-05 17:07:47 +01:00
Tom Christie
6942fa5dab
Mask view docstring on 401 and 403 responses. Closes #3216 .
2015-08-05 13:59:55 +01:00
Tom Christie
6161ac7d07
Fix parse_html_dict signature. Closes #3212 .
2015-08-05 13:45:56 +01:00
Tom Christie
7b51508600
Error on double underscore ordering with CursorPagination. Refs #3221 .
2015-08-05 13:42:44 +01:00
Tom Christie
bf35906dc0
FilePathField subclassing from ChoiceField
2015-08-03 10:17:41 +01:00
Tom Christie
877e964d7e
Don't need to support Django 1.4 with FilePathField.
2015-08-03 10:15:28 +01:00
Tom Christie
8d7c0a8474
Merge branch 'feature/filepathfield' of https://github.com/Ins1ne/django-rest-framework into Ins1ne-feature/filepathfield
2015-08-03 10:09:46 +01:00
Tom Christie
650866cc43
Blank relational fields map to required=False serializer fields. Closes #3210 .
2015-08-03 09:48:03 +01:00
Tom Christie
472784b70a
Docs for custom hyperlinked fields.
2015-08-03 09:27:03 +01:00
Tom Christie
a543fae180
Merge pull request #2766 from delinhabit/allow-null-list-serializer
...
Modify subtle ChildSerializer(many=True, allow_null=True) behavior.
2015-07-31 10:11:21 +01:00
Tom Christie
e68d737825
Respect blank on many to many, and set allow_empty=False if it is not present. Closes #2804 .
2015-07-30 17:03:08 +01:00
Tom Christie
ed3f9593af
Merge branch 'version-3.2' into remove-url-from-future
2015-07-30 16:02:40 +01:00
Tom Christie
1b3b01e042
Remove unused imports
2015-07-30 15:59:27 +01:00
Tom Christie
c8ad0cce19
Bump minimum Django version to 1.5
2015-07-30 15:43:39 +01:00
Tom Christie
c203ca4c64
Deprecations
2015-07-30 15:26:42 +01:00
Tom Christie
5b39d820be
Remove 'load url from future' tags in templates.
2015-07-30 15:14:02 +01:00
Tom Christie
1f55bc747b
Merge pull request #2926 from tomchristie/admin-style
...
Admin style renderer
2015-07-30 15:01:37 +01:00
Tom Christie
79b825ef32
Drop unused import
2015-07-30 14:38:04 +01:00
Tom Christie
5c1d6a9200
Docs for AdminRenderer
2015-07-30 14:07:51 +01:00
Hachikooking
d2ae7d4fcd
Add args to the function call for unnamed parameters
2015-07-29 14:43:25 +02:00
clemence.lop
2109f55244
Correct API ROOT to enable parametered urls
2015-07-28 15:55:49 +02:00
Tom Christie
6e3ba202af
Merge pull request #2690 from delinhabit/hyperlinked-relation-callable-source
...
Support source='some_method' for HyperlinkedRelatedField.
2015-07-27 16:19:48 +01:00
Ion Scerbatiuc
d4353cc1fd
Moved the code comment inside the if block and removed whitespace
2015-07-27 07:57:05 -07:00
Ion Scerbatiuc
0386a01673
Addressed CR comments
2015-07-27 07:45:35 -07:00
Tom Christie
402fb39396
HStoreField maps to ListField(CharField(allow_blank=True). Closes #2659 .
2015-07-27 13:18:49 +01:00
Tom Christie
f1e2135b04
Restyle horizontal checkbox. Closes #2783 .
2015-07-27 13:11:24 +01:00
Tom Christie
798cd1a637
Fix for DjangoObjectPermissionsFilter with Guardian < 1.3
2015-07-27 10:20:37 +01:00
Ion Scerbatiuc
47a22a55ca
Added a possible fix
2015-07-25 09:44:00 -07:00
Ion Scerbatiuc
bf25a6ecbc
Test case for using allow_null
with many=True
and a fix for it
2015-07-25 08:10:15 -07:00
Tom Christie
bdeb28944f
Use RuntimeError, not AssertionError when guarding against direct View.queryset evalutation. Refs #3180 .
2015-07-24 09:13:39 +01:00
Tom Christie
108dfafa44
Fix Django 1.5/1.4 compat issue
2015-07-24 09:02:16 +01:00
Tom Christie
c0e3e670ca
Fix Django compat for Queryset import
2015-07-23 17:43:49 +01:00
Tom Christie
e05021c8c6
Guard against erronous direct .queryset evaluation in CBVs.
2015-07-23 17:17:18 +01:00