Serhiy Voyt
3326ddc865
Merge branch 'master' into modelserialization-charfield-with-null
2014-06-27 18:10:50 +03:00
TankorSmash
544183f64f
typo in the docs
2014-06-16 19:13:02 -04:00
Tom Christie
1386767013
Version 2.3.14
2014-06-12 11:47:26 +01:00
Xavier Ordoquy
e8ec81f5e9
Fixed #1624 (thanks @abraithwaite)
2014-06-08 09:03:21 +02:00
khamaileon
08c4594145
Replace ChoiceField type_label
2014-06-05 12:49:02 +02:00
Danilo Bargen
6cb6bfae1b
Always use specified content type in APIRequestFactory
...
If `content_type` is specified in the `APIRequestFactory`, always
include it in the request, even if data is empty.
2014-05-30 17:53:26 +02:00
khamaileon
eab5933070
Add the allow_add_remove parameter to the get_serializer method
2014-05-26 18:43:50 +02:00
Piper Merriam
807f7a6bb9
Fix _resolve_model to work with unicode strings
2014-05-22 15:18:51 -06:00
John Spray
04c820b8e5
fields: allow help_text on SerializerMethodField
...
...by passing through any extra *args and **kwargs
to the parent constructor.
Previously one couldn't assign help_text to a
SerializerMethodField during construction.
2014-05-22 15:24:35 +01:00
Tom Christie
218b94e606
Merge pull request #1536 from Ian-Foote/choicefield_blank_display_value
...
Allow customising ChoiceField blank display value
2014-05-20 16:03:51 +01:00
allenhu
a1a3ad7639
fix pep8
2014-05-19 09:53:05 +08:00
Xavier Ordoquy
5c12b07681
Added missing import.
2014-05-16 19:40:02 +02:00
Xavier Ordoquy
a704d5a206
Fixed tests for python 3.4
2014-05-16 01:20:40 +02:00
Carlton Gibson
d69d975015
Merge pull request #1564 from alumni/master
...
Fixes #1535 (HTML widget missing `id` attribute)
2014-05-09 10:36:06 +02:00
Carlton Gibson
0ff474d7c4
Updated failing test from #1575
2014-05-08 11:20:03 +02:00
Carlton Gibson
591d5240da
Merge pull request #1575 from ewdicus/iso8601
...
Add colon to time zone offset in readable_datetime_formats
2014-05-08 09:34:06 +02:00
Elliott
11115fde9c
Add colon to time zone offset in readable_datetime_formats
2014-05-07 11:37:20 -07:00
Serhiy Voyt
4e6a21344f
Fixed test.
2014-05-07 18:42:02 +03:00
Serhiy Voyt
27be31bd8a
In case of None value returns empty string instead of NoneType.
2014-05-07 18:37:08 +03:00
Serhiy Voyt
1ce1f387b0
Charfied from_native method returns default instead of None. Updated tests.
2014-05-06 21:57:25 +03:00
Serhiy Voyt
98cc821099
Extended test with case of saveing model with blank not null field.
2014-05-06 20:34:30 +03:00
Lucian Mocanu
708c7b3a81
Added test case to check if the proper attributes are set on html widgets.
2014-05-06 14:17:51 +02:00
Carlton Gibson
8e78a38de5
Merge pull request #1485 from Atrasoftware/master
...
Use help_text, verbose_name, editable attributes for related fields
2014-05-06 13:43:15 +02:00
Lucian Mocanu
4e33ff05d9
Automatically set the field name as value for the HTML id attribute on the rendered widget.
2014-05-04 00:12:08 +02:00
Charlie Denton
ccf3c508bd
Fix missing message in ValidationError
2014-05-02 21:58:49 +01:00
Charlie Denton
c15dab903d
Mark strings in AuthTokenSerializer as translatable
2014-05-01 10:18:16 +01:00
Xavier Ordoquy
5333a93126
Merge pull request #1409 from tuky/patch-1
...
remove spaces from META['HTTP_X_FORWARDED_FOR'] as throttle key
2014-04-30 21:38:21 +02:00
Emanuele Pucciarelli
295a4ab62d
Added help_text to expected response in test
2014-04-29 22:16:11 +02:00
Emanuele Pucciarelli
fc44cd8d6a
Sync test result w/ new label
2014-04-29 21:45:57 +02:00
Emanuele Pucciarelli
f54399ea77
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
rest_framework/tests/models.py
2014-04-29 21:41:53 +02:00
Tom Christie
1085b64fec
Merge pull request #1543 from sinitsynsv/master
...
Add help_text and verbose_name attribute mapping for related field
2014-04-28 20:23:12 +01:00
Max Peterson
73597a16a2
Better Python < 3 compatibility.
2014-04-28 13:13:51 +01:00
Max Peterson
170fa10ae0
Python < 3 compatibility.
2014-04-28 13:10:34 +01:00
Max Peterson
1c777ffe8b
Ensure Token.generate_key returns a string.
2014-04-28 12:35:55 +01:00
Kamil Niski
82094554e5
Minor typo
2014-04-27 02:54:47 +02:00
Sergey Sinitsyn
a6e525cf3a
Add help_text and verbose_name attribute mapping for related field
2014-04-24 15:58:53 +06:00
Ian Foote
6c108c459d
Allow customising ChoiceField blank display value
2014-04-16 12:32:04 +01:00
Xavier Ordoquy
1d404874b3
Merge pull request #1527 from Ian-Foote/generic_foreign_key
...
Set GenericForeignKey fields on object before save
2014-04-16 11:27:06 +02:00
Carlton Gibson
03b4c60b2d
Merge pull request #1518 from hroncok/patch-1
...
Add more TRAILING_PUNCTUATION to work with YAML
2014-04-15 15:59:25 +02:00
Miro Hrončok
ef1d652827
Introduce tests for urlize_quoted_links() function
2014-04-15 15:33:14 +02:00
Carlton Gibson
c93ddf1750
Merge pull request #1520 from hroncok/patch-2
...
Allow unicode YAML dump
2014-04-15 15:13:51 +02:00
Miro Hrončok
617c982591
Add test for UnicodeYAMLRenderer
2014-04-15 14:12:09 +02:00
Vladislav Vlastovskiy
3fe0383572
Fixed convert bytes to str
...
Use compact function for convert
2014-04-14 13:21:24 +04:00
Vladislav Vlastovskiy
d1f4dfca20
Removed decode from test filename
2014-04-14 13:04:18 +04:00
Vladislav Vlastovskiy
d474934d36
Fixed return type
...
From bytes to str
2014-04-14 13:01:24 +04:00
Vladislav Vlastovskiy
063addabfe
Removed encode from test
...
Django does not produce such a decoding by default, this test was not honest.
2014-04-14 12:28:41 +04:00
Vladislav Vlastovskiy
4b3eb6e0b0
Fixed parse file name
2014-04-14 12:21:38 +04:00
Ian Foote
853c7a16c1
Use setattr for adding fields to a new instance
...
Add test for restoring a GenericForeignKey
2014-04-13 17:33:45 +01:00
Ian Foote
0a0e4f22e7
Set GenericForeignKey fields on object before save
...
* A model with a required GenericForeignKey can be saved if the field is set
2014-04-12 17:51:02 +01:00
Ian Leith
613df5c650
Fix dict_keys equality test for python 3.
2014-04-11 05:49:49 +01:00
