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 |
|
David Muller
|
7c0d14a6d5
|
Bump pytest-django version to 2.8.0
|
2015-01-18 13:55:53 -08:00 |
|
Tom Christie
|
492f3c410d
|
Cleaning up cursor implementation
|
2015-01-17 00:59:02 +00:00 |
|
Tom Christie
|
4919492582
|
First pass at cursor pagination
|
2015-01-17 00:10:43 +00:00 |
|
Tom Christie
|
dc18040ba4
|
Merge pull request #2419 from tomchristie/include-pagination-in-browsable-api
Include pagination control in browsable API.
|
2015-01-16 20:36:09 +00:00 |
|
Tom Christie
|
86d2774cf3
|
Fix compat issues
|
2015-01-16 20:30:46 +00:00 |
|
Tom Christie
|
8b0f25aa0a
|
More pagination tests & cleanup
|
2015-01-16 16:55:46 +00:00 |
|
Tom Christie
|
50db8c092a
|
Minor test cleanup
|
2015-01-16 16:55:28 +00:00 |
|
Tom Christie
|
53edd37df5
|
Tests for LimitOffsetPagination
|
2015-01-15 21:07:05 +00:00 |
|
Tom Christie
|
68dfa369b5
|
Flake 8 fixes
|
2015-01-15 16:55:04 +00:00 |
|
Tom Christie
|
d76e83dd78
|
Tweaks, and add pagination controls for offset/limit.
|
2015-01-15 16:52:07 +00:00 |
|
Tom Christie
|
313aa727e3
|
Tweaks
|
2015-01-14 17:46:41 +00:00 |
|
Tom Christie
|
3833a5bb8a
|
Include pagination control in browsable API
|
2015-01-14 16:51:26 +00:00 |
|
Tom Christie
|
f13fcba9a9
|
Include paragraph around view description in browable API
|
2015-01-14 13:20:02 +00:00 |
|
Tom Christie
|
4d287c7aef
|
Include paragraph around view description in browable API
|
2015-01-14 13:19:56 +00:00 |
|
Tom Christie
|
4ce4132e08
|
Preserve ordering on relationship drop-down choices. Closes #2408.
|
2015-01-14 12:56:03 +00:00 |
|
Tom Christie
|
12de43fc0c
|
Merge pull request #2395 from tomchristie/pagination-api
First pass at 3.1 pagination API
|
2015-01-13 17:22:03 +00:00 |
|
Tom Christie
|
1bcec3a0ac
|
API tweaks and pagination documentation
|
2015-01-13 17:14:13 +00:00 |
|
Tom Christie
|
564f845e21
|
Lower header font weights for nicer docs style
|
2015-01-13 12:21:03 +00:00 |
|
Tom Christie
|
8e2dc6b26d
|
Update internationalization docs
|
2015-01-13 12:07:25 +00:00 |
|
Tom Christie
|
2b28026fc1
|
Translation info -> project management
|
2015-01-13 10:44:40 +00:00 |
|
Carlton Gibson
|
41e13d73fa
|
Merge pull request #2407 from philipn/filters_link_fix
Fix link to `django-rest-framework-filters`
|
2015-01-13 09:04:33 +01:00 |
|
Philip Neustrom
|
7f9a62a5bf
|
Fix link to django-rest-framework-filters (formerly
`django-rest-framework-chain`)
|
2015-01-13 15:22:08 +08:00 |
|