Commit Graph

5244 Commits

Author SHA1 Message Date
Tom Christie
691ae5b646 Recommend 'pip list --outdated' instead of using pip-review 2015-02-17 13:40:59 +00:00
Tom Christie
466bbbb308 Merge pull request #2568 from tomchristie/requirements-refactor
Requirements refactor.
2015-02-17 13:03:56 +00:00
Tom Christie
028c477c22 Note on using pip-review in docs. 2015-02-17 12:56:19 +00:00
Tom Christie
9f4f9c9c9f Single source of truth for requirements 2015-02-17 12:46:55 +00:00
José Padilla
85bf127943 Merge pull request #2567 from carltongibson/18-warning
Move `importlib` fallback into compat.
2015-02-17 08:39:06 -04:00
Tom Christie
dbd2352165 Fixes for latest pep8 updates. Refs #2563. 2015-02-17 10:58:00 +00:00
Carlton Gibson
c5eb5b2201 Move importlib fallback into compat. 2015-02-17 11:55:15 +01:00
Tom Christie
76fe710c0d Merge pull request #2565 from carltongibson/18-warning
Adjust importlib import
2015-02-17 10:25:56 +00:00
Carlton Gibson
daf1d59d0f Adjust importlib import 2015-02-17 11:22:37 +01:00
Tom Christie
4248a8d3fc Merge pull request #2198 from tomchristie/version-3.1
Version 3.1
2015-02-13 13:38:44 +00:00
Kevin Brown
84260b5dd6 Merge pull request #2550 from maryokhin/patch-1
Remove '.model' shortcut from viewset docs
2015-02-11 19:39:51 -05:00
Tymur Maryokhin
9d80335ac8 Remove '.model' shortcut from viewset docs. Refs #2486. Closes #2549. 2015-02-12 01:10:03 +01:00
Tom Christie
ad32e14360 Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1 2015-02-11 14:19:18 +00:00
Tom Christie
c3425accde Fix incorrect HTML parsing for DictField 2015-02-11 14:19:07 +00:00
Xavier Ordoquy
637af1fc14 Merge pull request #2540 from linovia/release/3.0.5
Release/3.0.5
2015-02-10 23:48:38 +01:00
Xavier Ordoquy
59b3fe8f39 Bumped the version to 3.0.5 2015-02-10 22:48:04 +01:00
Xavier Ordoquy
f6033cee87 Add release notes for 3.0.5. 2015-02-10 22:46:54 +01:00
Tom Christie
b999db1c46 Merge pull request #2535 from carltongibson/search-filter-duplicates
Fix duplicate results of `ManyToManyField` when using `SearchFilter`.
2015-02-10 10:43:00 +00:00
Carlton Gibson
3522b69394 Add distinct call in filter_queryset 2015-02-10 10:51:38 +01:00
Carlton Gibson
d87bb67d11 Failing test case for #1488 2015-02-10 10:50:35 +01:00
Tom Christie
647d24a095 Merge pull request #2534 from JoarLeth/version-3.1
Fix typo in 3.1 announcement
2015-02-09 22:09:15 +00:00
Joar Leth
b18d773b51 Fix typo in 3.1 announcement 2015-02-09 22:51:49 +01:00
Tom Christie
fbb21caaaa Merge master 2015-02-09 20:43:50 +00:00
Tom Christie
7b639c0cd0 Drop django master from the build matrix.
Currently always going to be a know failure case.
We can add it back when we start to consdier Django 1.9 support.
2015-02-09 17:57:08 +00:00
Tom Christie
873fb69395 Merge pull request #2530 from tomchristie/attribute-proxying-fix
Fix misleading `AttributeError` tracebacks on `Request` objects.
2015-02-09 17:56:25 +00:00
Tom Christie
1a087c8c5b Fix .gitignore 2015-02-09 17:47:59 +00:00
Tom Christie
b2939c157d Fixes for latest version of pep8 2015-02-09 17:43:20 +00:00
Tom Christie
0669f507b3 pep8 fix 2015-02-09 17:22:13 +00:00
Tom Christie
54d82f59ed Py3 compat fix 2015-02-09 17:19:22 +00:00
Tom Christie
d13c807616 Fix misleading AttributeErrors 2015-02-09 17:02:54 +00:00
Tom Christie
407480b484 Minor docs work 2015-02-09 17:01:41 +00:00
Tom Christie
0240df1a38 Minor internal API cleanpu 2015-02-06 16:15:10 +00:00
Tom Christie
670723f021 Minor cleanups/improvements to ModelSerializer API 2015-02-06 15:45:02 +00:00
José Padilla
235b98e427 Merge pull request #2460 from mmarvick/master
Small fixes to the tutorial
2015-02-06 11:31:25 -04:00
Tom Christie
5d8c3abe72 Fix typo 2015-02-06 15:27:35 +00:00
Tom Christie
dec3493d7c Minor cleanup 2015-02-06 14:43:43 +00:00
Tom Christie
a435b1b355 Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1 2015-02-06 14:39:31 +00:00
Tom Christie
1f99612845 Upgrade pending deprecations to deprecations 2015-02-06 13:21:35 +00:00
Tom Christie
0e4d202c58 Merge pull request #2527 from linovia/feature/secured_pypi_upload
Use twine to upload to pypi.
2015-02-06 13:10:48 +00:00
Tom Christie
1d4956f616 Pagination images 2015-02-06 13:08:04 +00:00
Xavier Ordoquy
750d0c9f2b Add Twine to the requirements. 2015-02-06 13:57:08 +01:00
Xavier Ordoquy
238a3b507b Add Twine to the requirements. 2015-02-06 13:50:40 +01:00
Tom Christie
53716f6152 Internationalization docs 2015-02-06 11:37:29 +00:00
Xavier Ordoquy
9dd97a0ee5 Fixed a typo. 2015-02-06 10:23:58 +01:00
Xavier Ordoquy
75ff754517 Use twine to upload to pypi. 2015-02-06 10:12:57 +01:00
José Padilla
7f801b9a01 Add trim_whitespace to CharField #2517
If set to `True` then leading and trailing
whitespace is trimmed. Defaults to `True`.
2015-02-06 01:09:19 -04:00
Michael Marvick
5bf803b6ed Revert some of the changes made in 1-serialization.md 2015-02-05 19:42:36 -08:00
Tom Christie
09488ad4da Link to ModelSerializer API 2015-02-06 00:25:03 +00:00
Tom Christie
1fdfea2758 Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1 2015-02-06 00:05:59 +00:00
Tom Christie
b11a98f1e7 Tweak gitignore 2015-02-06 00:05:42 +00:00