Commit Graph

6257 Commits

Author SHA1 Message Date
Aarni Koskela
bdf9c4997d Add types to isort's standard library list.
This re-stabilizes sorting after upgrading to 4.2.2.
2015-11-26 15:42:49 +02:00
Aarni Koskela
45c66dae42 Upgrade isort to 4.2.2.
This gets rid of a file encoding bug that occurs on Windows boxes where
the default implied encoding is cp1252, but the files themselves aren't.

The actual patch that seems to fix this is
1057d5e12e
but it seems like a good idea to upgrade to the latest and greatest.
2015-11-26 15:40:22 +02:00
Aarni Koskela
6dcb994c98 Upgrade transifex-client dependency to 0.11
Version 0.11b3's setup.py had an undeclared dependency on `py2exe` when
running on Windows (see
https://github.com/transifex/transifex-client/blob/0.11b3/setup.py#L23),
which made it impossible to install without having a working `py2exe` to
begin with.

This has been fixed in 0.11 proper.
2015-11-26 15:29:19 +02:00
José Padilla
200dda91ac Merge pull request #3675 from pt247/master
Fix for Incorrect regex in URLPathVersioning documentation #3638
2015-11-26 07:14:58 -04:00
Prashant Tiwari
8b97bb8f68 Fix for Incorrect regex in URLPathVersioning documentation #3638 2015-11-26 06:23:59 +00:00
Xavier Ordoquy
d0352ae6fc Merge pull request #3621 from linovia/feature/how_to_turn_pagination_off
Document how to turn pagination off
2015-11-25 12:57:25 +01:00
Tom Christie
6fd9813882 Merge pull request #3672 from linovia/feature/multitemplate
Make DRF compatible with multi template engine in Django 1.8
2015-11-25 11:45:50 +00:00
Xavier Ordoquy
d6c326623f Make DRF compatible with multi template engine in Django 1.8 2015-11-25 07:37:01 +01:00
Xavier Ordoquy
ff0eeaf77a Merge pull request #3670 from jpadilla/django-versions
Update Django versions
2015-11-24 19:42:17 +01:00
José Padilla
3bcb7dba8c Update Django versions 2015-11-24 14:23:14 -04:00
José Padilla
c7bf99330e Merge pull request #3663 from blueyed/doc-crispy-installed
doc: clarify that crispy-forms needs to be in INSTALLED_APPS
2015-11-23 10:21:53 -04:00
Daniel Hahler
e786e4c4a1 doc: clarify that crispy-forms needs to be in INSTALLED_APPS 2015-11-23 15:05:38 +01:00
Tom Christie
a8deb380ff Merge pull request #3660 from sloria/patch-1
Fix typo in docstring for ReadOnlyField
2015-11-21 10:09:26 +00:00
Steven Loria
b209fe04fc Fix typo in docstring for ReadOnlyField 2015-11-20 13:51:21 -05:00
Tom Christie
f30f25facc Merge pull request #3656 from andreif/fix/deprecated-related
Fix #3252 -- Use related_objects api for Django 1.9+
2015-11-19 12:22:23 +00:00
Andrei Fokau
2acc6a756c Use related_objects api for Django 1.9+ 2015-11-19 13:04:37 +01:00
Xavier Ordoquy
f3de2146ea Merge pull request #3650 from silviogutierrez/master
Documentation fix for list serializers.
2015-11-19 07:46:01 +01:00
Silvio J. Gutierrez
ece7973479 Updated comment. 2015-11-18 21:52:20 -05:00
Tom Christie
378b7b8963 Merge pull request #3655 from andreif/fix/headers-order
Sort response headers in api renderer
2015-11-18 17:25:54 +00:00
Xavier Ordoquy
edc5a79b85 Merge pull request #3497 from Ins1ne/feature/3340
update docs about detail page link for AdminRenderer
2015-11-18 17:38:07 +01:00
Andrei Fokau
8692816401 Sort response headers in api renderer to keep the same order 2015-11-18 17:33:12 +01:00
Tom Christie
43c45cc939 Merge pull request #3654 from andreif/fix/deprecation-warning-1.9
Fix template.render deprecation warnings for Django 1.9
2015-11-18 16:19:09 +00:00
Andrei Fokau
802ee5d0ea Fix template.render deprecation warnings for 1.9+ 2015-11-18 17:06:35 +01:00
Tom Christie
04158e187e Merge pull request #3513 from pattisdr/feature/ListField_needs_to_enforce_list
ListField does not enforce that input is a list
2015-11-18 12:19:40 +00:00
Silvio J. Gutierrez
f7646627f1 Documentation fix for list serializers. 2015-11-17 19:09:49 -05:00
Tom Christie
75a63c2c2e Merge pull request #3643 from jpadilla/django19-rc
Test against Django 1.9rc1
2015-11-17 14:03:42 +00:00
José Padilla
e2ac148367 Test against Django 1.9rc1 2015-11-17 09:58:55 -04:00
José Padilla
5cde5c6adf Merge pull request #3642 from willdady/master
Removing references to get_paginate_by() as it no longer exists.
2015-11-17 09:44:50 -04:00
Will Dady
ca0841576f Removing references to get_paginate_by() as it no longer exists. 2015-11-17 15:00:00 +11:00
Tom Christie
316c374b02 Merge pull request #3635 from martinhill/issue_3634
Relation fields no to_fields attribute attribute break serializer
2015-11-16 16:20:38 +00:00
Martin Hill
ff36cbe4ba same logic, more pythonic 2015-11-14 23:04:32 -05:00
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
Dawn Pattison
3ddbf92bf9 Remove unicode from exception value. 2015-11-13 10:41:57 -05:00
Dawn Pattison
5fdc4f22cf Add tests to ensure ListField does not except dictionary as input. 2015-11-13 10:17:09 -05:00
Xavier Ordoquy
4eef2ea21e Merge pull request #3600 from nfletton/fix/browser/single-tab-render
Fix regression causing raw data form to not display
2015-11-13 13:24:47 +01:00
Tom Christie
5899b00dac Merge pull request #3626 from linovia/bug/fix_failing_py35_test_case
Fix module name with Python 3.5 (#3534)
2015-11-12 10:01:36 +00:00
Xavier Ordoquy
795cf4716d Fix module name with Python 3.5 2015-11-11 17:44:46 +01:00
Xavier Ordoquy
23460bfa41 Add a note about how to turn pagination off 2015-11-10 11:33:54 +01:00
Tom Christie
944a1711ec Merge pull request #3606 from ryanhiebert/tox-no-basepython
Don't specify unnecessary basepython
2015-11-06 08:14:08 +01:00
Ryan Hiebert
240eb672af Don't specify basepython
tox automatically includes basepython definitions for all the common
python versions, and will recognize it in factors of envs in the
envlist.
2015-11-05 12:12:29 -06:00
Xavier Ordoquy
2704036ad5 Merge pull request #3602 from vkaracic/patch-1
Typo
2015-11-05 11:52:52 +01:00
Vedran Karačić
ede15645e0 Typo 2015-11-05 11:51:29 +01:00
nfletton
f85ad301eb Fix regression causing raw data form to not display 2015-11-04 15:43:25 -07:00
Tom Christie
7d59991636 Merge pull request #3595 from jpadilla/update-version
Test against Django 1.8.6
2015-11-04 22:14:13 +00:00
José Padilla
08a00ce46d Test against Django 1.8.6 2015-11-04 13:27:19 -04:00
Tom Christie
d959c6337a Release notes 2015-11-04 14:59:09 +00: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