Tom Christie
|
4cb164b66c
|
Add missing skipUnless(django_filters)
|
2015-01-23 11:49:57 +00:00 |
|
Tom Christie
|
e988d57853
|
Fix template loader monkey patching to also support 1.8
|
2015-01-23 11:47:01 +00:00 |
|
Tom Christie
|
e307fd289c
|
Fix test matrix
|
2015-01-23 11:38:58 +00:00 |
|
Tom Christie
|
5eb6949e9f
|
Drop django-filter from 1.8
|
2015-01-23 11:32:04 +00:00 |
|
Tom Christie
|
25a703b42c
|
Work around meta API differences
|
2015-01-23 11:15:11 +00:00 |
|
Tom Christie
|
e56f0a928c
|
Merge pull request #2441 from linovia/bugfix/2425
Support for Django 1.8a1
|
2015-01-23 09:50:10 +00:00 |
|
Tom Christie
|
37dc2520f9
|
Merge pull request #2428 from tomchristie/cursor-pagination
Cursor pagination
|
2015-01-22 17:44:01 +00:00 |
|
Tom Christie
|
43d983fae8
|
Add paging controls
|
2015-01-22 17:25:12 +00:00 |
|
Tom Christie
|
0822c9e558
|
Cursor pagination now works with OrderingFilter
|
2015-01-22 16:12:05 +00:00 |
|
Tom Christie
|
408261ee02
|
Support ordering attribute either on view or on pagination class for CursorPagination
|
2015-01-22 15:15:52 +00:00 |
|
Tom Christie
|
83a82b44a5
|
Support for tuple ordering in cursor pagination
|
2015-01-22 15:07:01 +00:00 |
|
Tom Christie
|
38a2ed6f62
|
Python 3 fixes for cursor pagination
|
2015-01-22 14:04:25 +00:00 |
|
Tom Christie
|
ca372ef6ef
|
Fix for python 3
|
2015-01-22 13:50:51 +00:00 |
|
Tom Christie
|
94b5f7a86e
|
Tidy up cursor tests and make more comprehensive
|
2015-01-22 12:14:52 +00:00 |
|
Tom Christie
|
f1af603fb0
|
Tests for reverse pagination
|
2015-01-22 10:51:04 +00:00 |
|
Tom Christie
|
cae9528c54
|
Add support for reverse cursors
|
2015-01-22 10:28:19 +00:00 |
|
Tom Christie
|
0b91714100
|
Merge pull request #2444 from duncm/patch-1
fix link to Django CSRF docs
|
2015-01-22 09:38:00 +00:00 |
|
Duncan Maitland
|
6e471ad8f4
|
fix link to Django CSRF docs
|
2015-01-22 18:29:20 +11:00 |
|
Tom Christie
|
5e52f0fd8c
|
Merge branch 'version-3.1' into cursor-pagination
|
2015-01-21 20:29:58 +00:00 |
|
Xavier Ordoquy
|
15f797fd3e
|
Owned by import *
|
2015-01-21 19:46:31 +01:00 |
|
Xavier Ordoquy
|
857185cf07
|
Workaround Django issue 24198.
|
2015-01-21 19:29:40 +01:00 |
|
Xavier Ordoquy
|
a7567efa8d
|
Use compact traceback for errors reporting.
|
2015-01-21 19:26:57 +01:00 |
|
Tom Christie
|
4cf03e30ff
|
Do not render HTML output for hidden fields. Closes #2410.
|
2015-01-21 14:27:51 +00:00 |
|
Tom Christie
|
e59b3d1718
|
Make ReturnDict cachable. Closes #2360.
|
2015-01-21 14:18:13 +00:00 |
|
Tom Christie
|
9ec08ce578
|
Merge master
|
2015-01-21 13:12:14 +00:00 |
|
Tom Christie
|
9d24809a4d
|
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
|
2015-01-21 13:03:49 +00:00 |
|
Tom Christie
|
da6ef3d0b0
|
Allow missing fields option for inherited serializers. Closes #2388.
|
2015-01-21 13:03:37 +00:00 |
|
José Padilla
|
c0fa92e9ad
|
Merge pull request #2438 from soooooot/patch-1
correcting unclosed quote in docs routers.md
|
2015-01-20 10:33:12 -04:00 |
|
soooooot
|
3ca8f85a5b
|
correcting unclosed quote in routers.md
correcting unclosed quote in routers.md
|
2015-01-20 22:24:58 +08:00 |
|
José Padilla
|
e39d8410de
|
Merge pull request #2437 from erictheise/patch-2
correcting "it's" to "its" in Tutorial 1
|
2015-01-19 19:08:11 -04:00 |
|
Eric Theise
|
b0bc79ed4d
|
correcting "it's" to "its" in Tutorial 1
|
2015-01-19 14:49:36 -08:00 |
|
Tom Christie
|
e5b94f7b7b
|
Merge branch 'version-3.1' into cursor-pagination
|
2015-01-19 15:23:08 +00:00 |
|
Tom Christie
|
3cc39ffbce
|
NotImplemented -> NotImplementedError
|
2015-01-19 15:22:38 +00:00 |
|
Tom Christie
|
6065cdbd93
|
Merge master
|
2015-01-19 15:16:57 +00:00 |
|
Tom Christie
|
fdeef89ba7
|
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
|
2015-01-19 14:48:42 +00:00 |
|
Tom Christie
|
46a3eda08d
|
NotImplemented -> NotImplementedError
|
2015-01-19 14:48:13 +00:00 |
|
Tom Christie
|
ae77ff9813
|
Merge pull request #2434 from alexsdutton/patch-1
NotImplemented is not an exception
|
2015-01-19 14:47:28 +00:00 |
|
Tom Christie
|
4f3c3a06cf
|
Drop trailing whitespace on indented JSON output. Closes #2429.
|
2015-01-19 14:41:10 +00:00 |
|
Alexander Dutton
|
af05820b1b
|
NotImplemented is not an exception
`NotImplemented` is a singleton object, not an exception. You should be raising `NotImplementedError` here instead.
|
2015-01-19 14:23:13 +00:00 |
|
Tom Christie
|
0dffc46cb7
|
ReturnDict and ReturnList repr as standard dict/list. Closes #2421.
|
2015-01-19 14:21:09 +00:00 |
|
Tom Christie
|
da1db34a36
|
Handle UUID objects in JSONEncoder. Closes #2433.
|
2015-01-19 14:19:01 +00:00 |
|
Tom Christie
|
b3a0a2794b
|
Merge pull request #2430 from Polyconseil/fbochu/timedelta-json-serialiser-python26-support
Fix timedelta JSON serialization on Python 2.6.
|
2015-01-19 12:15:02 +00:00 |
|
Fabien Bochu
|
5484d570cb
|
Fix timedelta JSON serialization on Python 2.6.
|
2015-01-19 13:09:08 +01:00 |
|
Tom Christie
|
dbb684117f
|
Add offset support for cursor pagination
|
2015-01-19 09:24:42 +00:00 |
|
Xavier Ordoquy
|
4f27b966a5
|
Merge pull request #2427 from DavidMuller/pytest_version_bumps
Preliminary Support For Django 1.8 Alpha
|
2015-01-19 02:40:15 +01:00 |
|
David Muller
|
b5128ca574
|
Save objects before assigning them in InheritedModelSerializationTests; Django 1.8 now throws an error when assigning unsaved objects to Foreign Key, GenericForeignKey, and OneToOneFields
|
2015-01-18 15:19:11 -08:00 |
|
David Muller
|
a82a4d0a09
|
Add Django 1.8 alpha to test matrix
|
2015-01-18 15:04:50 -08:00 |
|
David Muller
|
1421b057f7
|
Bump pytest version in tox.ini to 2.6.4
|
2015-01-18 14:48:23 -08:00 |
|
David Muller
|
eb91076886
|
Bump pytest-django version in tox.ini to 2.8.0
|
2015-01-18 14:47:37 -08:00 |
|
David Muller
|
00449dc42c
|
Bump pytest version to 2.6.4
|
2015-01-18 13:56:52 -08:00 |
|