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
Tom Christie
c94b354efa
Merge pull request #3509 from jpadilla/textfield-max-length
...
Map TextField max_length to CharField
2015-10-16 12:31:26 +01: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
Xavier Ordoquy
5570db402f
Merge pull request #3501 from ztanner/patch-1
...
Various typo/grammar fixes
2015-10-15 08:21:22 +02:00
Zack Tanner
6fe021eea7
Various typo fixes
2015-10-14 19:09:11 -07:00
José Padilla
ad001143c9
Merge pull request #3498 from Ins1ne/feature/admin_renderer_jquery
...
fix typo for adding jquery string in AdminRenderer
2015-10-14 09:06:52 -04:00
Aider Ibragimov
79008ea210
fix typo for adding jquery string in AdminRenderer
2015-10-14 15:56:26 +03:00
Xavier Ordoquy
68312cb0bc
Merge pull request #3488 from demokrates/patch-1
...
Update versioning.md
2015-10-12 10:25:39 +02:00
demokrates
47c9d2a4d3
Update versioning.md
...
Changed settings attribute 'VERSION_PARAMETER' --> to 'VERSION_PARAM'.
2015-10-12 10:10:08 +02:00
Xavier Ordoquy
fa1cfae991
Merge pull request #3485 from dulmandakh/dulmandakh-guardian-check-installed-apps
...
Update compat.py
2015-10-09 08:13:42 +02: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
85cd717ec0
Merge pull request #3481 from nryoung/fix-codecov
...
Fix codecov on Travis CI
2015-10-08 19:47:33 +01:00
Nic Young
739d3892c5
Fix codecov on Travis CI
...
The coverage report needs to be explicitly created with arguments passed
in to pytest-cov
2015-10-07 22:20:46 -07:00
Xavier Ordoquy
6fb96e93ef
Merge pull request #3469 from PhilipGarnero/patch-1
...
Added django-rest-framework-social-oauth2 to list of third party packages
2015-10-03 07:48:50 +02:00
Philip Garnero
3cdd3c5f6e
Added django-rest-framework-social-oauth2 to list of third party packages
2015-10-02 14:30:27 -07:00
Tom Christie
63662e352d
Merge pull request #3461 from mcastle/patch-1
...
Use serializers.ValidationError in AuthTokenSerializer
2015-10-02 11:07:20 +01:00
Xavier Ordoquy
689afd83cc
Merge pull request #3462 from theengineear/patch-1
...
Small doc typo `throttles` --> `throttling`
2015-10-01 10:22:55 +02:00
Andrew
f60c0e99f6
Small doc typo throttles --> throttling
2015-10-01 14:25:04 +07: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
Xavier Ordoquy
cadbfbabe2
Merge pull request #3459 from rhblind/master
...
Added drf-haystack to third party resources
2015-09-30 10:26:58 +02:00
Rolf Håvard Blindheim
0e56b2ea74
Added drf-haystack to third party resources
2015-09-30 10:24:21 +02:00
Xavier Ordoquy
71c37762d6
Merge pull request #3457 from pombredanne/patch-1
...
Fixed minor doc typo.
2015-09-29 22:00:44 +02:00
Philippe Ombredanne
3262ee6c90
Fixed minor doc typo.
2015-09-29 21:59:09 +02:00
Tom Christie
de5732f393
Merge pull request #3454 from tomchristie/json-field
...
Added JSONField.
2015-09-28 17:52:58 +01:00
Tom Christie
265ec8ac62
Handle binary or unicode with JSONField
2015-09-28 17:47:51 +01:00
Tom Christie
dad207de66
Don't attempt to test dicts (unordered)
2015-09-28 17:41:09 +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
ed677f0138
Update docs for content overriding
2015-09-28 16:37:48 +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
3d7740fbf3
Merge pull request #3450 from tomchristie/django-19-alpha
...
Django 1.9 support
2015-09-28 12:01:59 +01:00
Tom Christie
02e1f69d2b
Django 1.9 support
2015-09-28 11:44:07 +01:00
Tom Christie
c4211ce7d8
Merge pull request #3449 from tomchristie/carltongibson-drop-django-16
...
Drop django 16
2015-09-28 11:23:23 +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
4762a73e34
Merge pull request #3342 from tomchristie/version-3.3
...
Compat updates for version 3.3
2015-09-28 11:06:42 +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
Tom Christie
509c54de9b
Merge pull request #3435 from stianjensen/unique-error
...
Use model error_messages when available
2015-09-24 13:10:14 +01:00
José Padilla
c28bc9896e
Merge pull request #3433 from atombrella/base_html_fix
...
fixing a trivial HTML tag which is closed twice
2015-09-23 11:56:16 -04: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
Mads Jensen
8a82a07f8d
fixing a trivial HTML tag which is closed twice
2015-09-23 10:51:23 +02:00
Xavier Ordoquy
7661398a4a
Merge pull request #3420 from linovia/release/3.2.4
...
Release/3.2.4
2015-09-23 01:51:07 +02:00
