Xavier Ordoquy
|
dee5fb5647
|
Merge remote-tracking branch 'reference/master' into feature/ipaddress-fix
Conflicts:
docs/api-guide/fields.md
|
2015-06-04 14:21:33 +01:00 |
|
Xavier Ordoquy
|
0c66c7cfa6
|
Merge pull request #3000 from linovia/ovangle/uuid_format2
Add 'format' argument to UUIDField
|
2015-06-03 12:32:23 +01:00 |
|
Xavier Ordoquy
|
734bf3cfe6
|
Merge pull request #2981 from jannon/fix-model-serializer-metadata
Read-Only RelatedField Metadata Failure Test and Fix
|
2015-06-02 15:09:05 +01:00 |
|
Xavier Ordoquy
|
0c97dd1806
|
Merge remote-tracking branch 'reference/master'
|
2015-06-02 13:04:57 +01:00 |
|
Xavier Ordoquy
|
8fa3284620
|
Merge remote-tracking branch 'reference/master'
|
2015-06-02 10:24:28 +01:00 |
|
Jannon Frank
|
a97c989248
|
fix read_only related field metadata
|
2015-06-02 00:40:00 -07:00 |
|
Nicolas Delaby
|
c2d2417237
|
Tell default error handler to doom the transaction on error
if `ATOMIC_REQUESTS` is enabled.
|
2015-06-02 09:19:58 +02:00 |
|
Xavier Ordoquy
|
d79956d40e
|
Translation update.
|
2015-06-02 00:20:46 +01:00 |
|
Xavier Ordoquy
|
f8eacc5bc0
|
Merge pull request #2993 from linovia/bug/2894
MultipleChoiceField empties incorrectly on a partial update using multipart/form-data (#2894)
|
2015-06-01 17:48:20 +01:00 |
|
Xavier Ordoquy
|
14055dd3f4
|
Merge pull request #2989 from ticosax/duration-field
Add DurationField
|
2015-06-01 17:38:57 +01:00 |
|
Nicolas Delaby
|
f701ecceb7
|
Add DurationField
|
2015-06-01 18:20:53 +02:00 |
|
Xavier Ordoquy
|
5c90bf9cc0
|
Fix for #2894 thanks to @carljm
|
2015-06-01 16:13:35 +01:00 |
|
Xavier Ordoquy
|
e3f856ff1d
|
Merge pull request #2975 from sheppard/read-only-nested
can't create nested serializers for unique_together relations
|
2015-06-01 12:01:40 +01:00 |
|
Corentin Smith
|
fa29f7dd1f
|
Fix minor typo
|
2015-05-30 17:57:35 +02:00 |
|
Xavier Ordoquy
|
ecb3ba5e1f
|
Merge pull request #2948 from bimusiek/master
Added test ensuring DecimalField accepts `2E+2` as 200 and validates decimal place correctly.
|
2015-05-29 11:52:33 +02:00 |
|
S. Andrew Sheppard
|
8c7b5fc5c1
|
pop required extra_kwargs if read_only is set
|
2015-05-27 21:14:13 -05:00 |
|
Tom Christie
|
95a27a108d
|
Merge pull request #2933 from cancan101/overide_method_action
Set the action on a view when override_method regardless of its None-ness
|
2015-05-27 09:10:58 +01:00 |
|
Petros Moisiadis
|
192719eed0
|
Improve coding style
On Tom's suggestion, improve coding style by using a single-line call to getattr() with a default value instead of a multi-line if/else clause.
|
2015-05-19 20:00:19 +03:00 |
|
Petros Moisiadis
|
a96ebd74b1
|
Fix flake8 error
Fix flake8 error
|
2015-05-19 19:48:53 +03:00 |
|
Petros Moisiadis
|
c63ea01f4f
|
Support User model in Django 1.4 that has not a USERNAME_FIELD attribute
Support User model in Django 1.4 that has not a USERNAME_FIELD attribute.
|
2015-05-19 19:05:50 +03:00 |
|
Petros Moisiadis
|
43b4ae752d
|
Import get_user_model from compat module
Import get_user_model from compat module to be compatible with older django versions (e.g. 1.4).
|
2015-05-19 18:00:17 +03:00 |
|
Petros Moisiadis
|
a13075486d
|
Compatibility code for getting user model
Compatibility code for getting user model
|
2015-05-19 17:57:27 +03:00 |
|
Petros Moisiadis
|
bb002262ac
|
Support basic authentication with custom user models that change username field
Support basic authentication with custom user models with a username field that is not named 'username'.
|
2015-05-19 17:42:44 +03:00 |
|
Michał Hernas
|
e8c226c2db
|
Fixed lint problems
|
2015-05-18 16:55:40 +02:00 |
|
Michał Hernas
|
069ea31cfb
|
Added test ensuring DecimalField accepts 2E+2 as 200 and validates
decimal place correctly.
|
2015-05-18 16:42:24 +02:00 |
|
David Sanders
|
b7edd46313
|
Use simpler dict.get() rather than try/except
|
2015-05-16 01:01:27 +10:00 |
|
David Sanders
|
8e84a9f6d0
|
Allow invalid outputs to pass through to_representation() for ChoiceField & MultipleChoiceField
|
2015-05-15 18:59:10 +10:00 |
|
Xavier Ordoquy
|
1a8c0b4bfc
|
Merge pull request #2930 from linovia/release/3.1.2
Release 3.1.2
|
2015-05-14 10:57:33 +02:00 |
|
Alex Rothberg
|
a804d0bd75
|
set the action when override_method regardless of its None-ness
|
2015-05-13 22:53:32 -04:00 |
|
Tom Christie
|
ea1145c5aa
|
Merge pull request #2905 from ticosax/django-object-perm-get_queryset
Allow DjangoObjectPermissions to use views that define get_queryset
|
2015-05-13 13:39:59 +01:00 |
|
Nicolas Delaby
|
031ac2a292
|
Allow DjangoObjectPermissions to use views that define get_queryset
|
2015-05-13 14:26:44 +02:00 |
|
Xavier Ordoquy
|
fb4ba3ad3c
|
Bump version to 3.1.2
|
2015-05-13 09:44:15 +02:00 |
|
Tom Christie
|
abcd6f2b9e
|
Merge pull request #2869 from ryangallen/datefield
DateField to_representation can handle str and empty values. Fixes #2656, #2687.
|
2015-05-01 16:33:43 +01:00 |
|
Tom Christie
|
2eb9107b87
|
Merge pull request #2798 from Boomerangz/depth-should-reduce
Depth should reduce on nested ModelSerializer classes.
|
2015-04-27 16:22:22 +01:00 |
|
Tom Christie
|
2394577dc2
|
Merge pull request #2757 from ekiourk/2630/Raise-exception-when-ModelSerializer-used-with-abstract-model
Raise error when ModelSerializer used with abstract model
|
2015-04-27 14:47:32 +01:00 |
|
José Padilla
|
9809f4d36a
|
Merge pull request #2809 from aparsons/master
Move ul.breadcrumb margin to bootstrap-tweaks.css
|
2015-04-26 11:15:50 -04:00 |
|
Tom Christie
|
450c541462
|
Merge pull request #2868 from ticosax/versioning-header-all
Check AcceptHeaderVersioning with content negotiation in place
|
2015-04-24 15:19:51 +01:00 |
|
Allard Hoeve
|
9a794beb1e
|
Remove mention of Django's built-in ValidationError in docstring
The `exception_handler` does not actually handle django.core.exceptions.ValidationError, so remove any mention of it.
This closes #2872
|
2015-04-24 15:37:42 +02:00 |
|
Ryan Allen
|
cbea03c85b
|
DateField to_representation can handle str and empty values. Fixes #2656, #2687.
|
2015-04-23 19:31:46 -05:00 |
|
Nicolas Delaby
|
63511c03d0
|
Check AcceptHeaderVersioning with content negotiation in place
|
2015-04-23 14:19:39 +02:00 |
|
Nicolas Delaby
|
24e9473036
|
Improve error message.
|
2015-04-22 11:22:37 +02:00 |
|
Nicolas Delaby
|
6f66798ad3
|
Prevent empty querysets to raises AssertionError.
|
2015-04-22 11:13:09 +02:00 |
|
Nicolas Delaby
|
c2e536bfda
|
Tell DjangoModelPermissions to rely on get_queryset first.
|
2015-04-22 10:18:30 +02:00 |
|
Tom Christie
|
0ca1145456
|
Merge pull request #2853 from ryangallen/master
Set IntegerField class variable for compiled decimal regex, comment for ...
|
2015-04-21 16:00:37 +01:00 |
|
Ryan Allen
|
32acc4a72b
|
Set IntegerField class variable for compiled decimal regex, comment for purpose
|
2015-04-21 10:52:52 -04:00 |
|
Tom Christie
|
605369e2b4
|
Merge pull request #2807 from iorlas/patch-2
Now it is possible to display viewset w/o paginator
|
2015-04-21 15:07:11 +01:00 |
|
Ryan Allen
|
1f10a39d31
|
Match IntegerField validation with Django's, preventing decimal values being stored as ints, fixes #2835.
Match IntegerField validation with Django IntegerField, prevents decimal values being stored as ints, fixes #2835
On branch master
|
2015-04-20 11:03:05 -04:00 |
|
Adam Parsons
|
72230a913e
|
Removed color from default
|
2015-04-18 16:52:20 -05:00 |
|
Adam Parsons
|
324ccc3664
|
Moved breadcrumb color to bootstrap-tweaks
Moved to color associated with the breadcrumb to the tweaks style sheet.
|
2015-04-18 16:50:32 -05:00 |
|
Tymur Maryokhin
|
1ddfef1212
|
Removed deprecated '.model' attribute check
|
2015-04-12 17:12:01 +02:00 |
|