Xavier Ordoquy
56b4390316
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
rest_framework/serializers.py
rest_framework/tests/test_authentication.py
2014-04-30 22:21:26 +02:00
Xavier Ordoquy
d8fb81ceb1
Merge pull request #1391 from kaygorodov/master
...
Turning off pagination
2014-04-30 20:14:16 +02:00
Laurent Bristiel
d8cb85ef8f
typo
2014-04-28 22:00:36 +02:00
dpetzel
5e8f05a8de
very minor typo in code example
2014-04-28 13:51:50 -04:00
Xavier Ordoquy
d08536ad9d
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/fields.md
docs/api-guide/routers.md
docs/topics/release-notes.md
rest_framework/authentication.py
rest_framework/serializers.py
rest_framework/templatetags/rest_framework.py
rest_framework/tests/test_authentication.py
rest_framework/tests/test_filters.py
rest_framework/tests/test_hyperlinkedserializers.py
rest_framework/tests/test_serializer.py
rest_framework/tests/test_testing.py
rest_framework/utils/encoders.py
tox.ini
2014-04-13 00:05:57 +02:00
Miro Hrončok
f68596a732
Document new UnicodeYAMLRenderer
2014-04-10 01:58:06 +02:00
Craig
3234a5dd6b
Fix python syntax in filtering docs
2014-04-08 22:56:07 -04:00
Tom Christie
abe14c06f7
Minor docs tweak
2014-03-17 08:36:13 +00:00
Tom Christie
dddbff5931
Tweak DRF compound fields docs
2014-03-17 08:33:18 +00:00
Steven Cummings
c779dce3e4
Serializer fields section for 3rd-party packages
...
* Add new section to serializer fields page where we can list and link 3rd-party packages that provide more field types
* Add an entry for drf-compound-fields
2014-03-16 18:55:21 -05:00
Peter Inglesby
2353878951
Add SEARCH_PARAM and ORDERING_PARAM to settings
...
Fixes #1434
2014-03-06 21:39:44 +00:00
Kumar McMillan
c2cd610b15
Adds HawkREST to 3rd party auth docs
2014-02-28 16:52:47 -06:00
Kumar McMillan
a4470c4276
Fix trailing whitespace
...
Sorry, my editor does this automatically
2014-02-28 16:51:32 -06:00
Charlie Denton
c3967c08ab
Minor docs example fix
...
Dates are smaller when they happen before.
2014-02-21 14:23:33 +00:00
Tom Christie
9841069373
Link to DRF-extensions. Refs #1430
2014-02-20 14:54:17 +00:00
Elvio Toccalino
1a4c6f075b
include djangorestframework-httpsignature in the docs
2014-02-20 01:07:39 -03:00
Saurabh Kumar
b3aa512d35
fix(docs): fix code indentation in serializers.md
...
It fixes the indentation of `restore_object()` in the section "Specifying which fields should be write-only" serializers documentation.
2014-02-18 20:39:39 +05:30
Bo Peng
6f4c2c6f05
Update throttling.md
...
Added comma to make DEFAULT_THROTTLE_CLASSES a tuple in example, for copy&paste to work nicely.
2014-02-14 13:47:06 -06:00
Vita Smid
821f848802
Minor typos fixed in api-guide/testing.md (request -> response).
2014-02-14 10:44:02 +01:00
Hassan Shamim
97b7c25987
Replace 'detail' with 'default_detail' in Exceptions guide and APIException class docstring.
2014-02-10 12:54:56 -06:00
Andrey Kaygorodov
2d20512d25
#1390 , docs, turning of pagination
2014-02-05 21:10:51 +08:00
Andrey Kaygorodov
d48ba1cff7
turn of pagination
2014-02-05 05:47:27 +08:00
RicterZ
ba8a0bac53
Fixed a bug backticks
...
fix
you may optionally exclude the ``self.check_object_permissions, and simply return the object from the `get_object_or_404` lookup.
to
you may optionally exclude the `self.check_object_permissions`, and simply return the object from the `get_object_or_404` lookup.
2014-02-04 23:41:13 +08:00
Charlie Denton
40b148a2e4
Viewsets docs typo
...
The docstring in the example said "update" instead of "create".
2014-02-03 14:54:44 +00:00
Jeff Fein-Worton
a33eb4177e
fixed typo (wrong "its")
2014-02-02 21:21:08 -08:00
meoooh
e437854a44
Update fields.md
2014-02-01 15:02:11 +09:00
Tom Christie
fab531961b
Merge pull request #1379 from bodylabs/exception_example
...
Fix doc for custom exception sample
2014-01-31 09:52:47 -08:00
Paul Melnikow
77ced39e6c
Fix doc for custom exception sample
...
The way to provide a default detail for APIException is to define a `default_detail` attribute on the subclass.
Defining a `detail` attribute without `default_detail` will not work, and will result in empty detail instead.
2014-01-31 12:26:45 -05:00
Tom Christie
e3c5a13451
Drop django-rest-framework-bulk API descriptions
2014-01-19 21:09:49 +00:00
Tom Christie
96e6565be8
Merge pull request #1363 from miki725/master
...
Added docs for bulk views from django-rest-framework-bulk.
2014-01-19 13:08:12 -08:00
José Padilla
1c34051f5e
Include the djangorestframework-jwt package
2014-01-18 23:51:18 -05:00
Miroslav Shubernetskiy
37cd49cac9
Added docs for bulk views from django-rest-framework-bulk.
2014-01-18 22:31:36 -05:00
Tom Christie
71c03b9db9
Security update to OrderingFilter
2014-01-15 14:27:41 +00:00
Tom Christie
d20c49da4a
More HyperlinkedModelSerializer docs
2014-01-14 20:34:33 +00:00
Tom Christie
85d74fc86a
Added write_only and write_only_fields. Refs #1306
2014-01-14 11:25:44 +00:00
Tom Christie
4ab97843e8
Merge pull request #1333 from bodylabs/2.4.0+lookup_regex
...
Let viewsets specify their regex
2014-01-13 07:34:58 -08:00
Yuri Prezument
6e622d644c
CharField - add allow_null argument
2014-01-12 10:53:54 +02:00
Tom Christie
b61cef435e
Merge pull request #1345 from bodylabs/serializers_doc
...
serializers.md: Fix typos
2014-01-10 05:25:21 -08:00
Paul Melnikow
4b8d1b66ab
serializers.md: Fix typos
2014-01-10 08:22:47 -05:00
Yuri Prezument
052e236fde
Fix URL/Slug Field signatures in docs
2014-01-09 18:12:30 +02:00
Tom Christie
78494401c5
Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains
2014-01-08 15:22:41 +00:00
Paul Melnikow
899381575a
Fix a typo
2014-01-04 17:03:01 -05:00
Paul Melnikow
3cd15fb171
Router: Do not automatically adjust lookup_regex when trailing_slash is True
...
BREAKING CHANGE
When trailing_slash is set to True, the router no longer will adjust the lookup regex to allow it to include periods. To simulate the old behavior, the programmer should specify `lookup_regex = '[^/]+'` on the viewset.
https://github.com/tomchristie/django-rest-framework/pull/1328#issuecomment-31517099
2014-01-04 16:57:50 -05:00
Paul Melnikow
a1d7aa8f71
Allow viewset to specify lookup value regex for routing
...
This patch allows a viewset to define a pattern for its lookup field, which the router will honor. Without this patch, any characters are allowed in the lookup field, and overriding this behavior requires subclassing router and copying and pasting the implementation of get_lookup_regex.
It's possible it would be better to remove this functionality from the routers and simply expose a parameter to get_lookup_regex which allows overriding the lookup_regex. That way the viewset config logic could be in the a subclass, which could invoke the super method directly.
I'm using this now for PostgreSQL UUID fields using https://github.com/dcramer/django-uuidfield . Without this patch, that field passes the lookup string to the database driver, which raises a DataError to complain about the invalid UUID. It's possible the field ought to signal this error in a different way, which could obviate the need to specify a pattern.
2014-01-04 16:45:03 -05:00
Tom Christie
75e8724731
Fuller notes on the 'base_name' argument. Closes #1160 .
2013-12-23 14:38:51 +00:00
Tom Christie
d24ea39a4e
Added note on view_name in hyperlinked relationships. Closes #1221
2013-12-23 14:29:22 +00:00
Tom Christie
52686420f4
Merge branch 'bennbollay-patch-1' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/routers.md
rest_framework/compat.py
tox.ini
2013-12-23 09:48:59 +00:00
Tom Christie
bc0e994784
Added example of using APIException class. Closes #1300
2013-12-21 21:10:05 +00:00
Tom Christie
1f3ded4559
Docs tweaks
2013-12-21 17:18:25 +00:00
Vitaly Babiy
22343ee117
Added links to djangorestframework-camel-case in the third party
...
sections of the docs for both parsers and renderers.
2013-12-21 07:07:06 -05:00