Commit Graph

4189 Commits

Author SHA1 Message Date
Tom Christie
18f2ca4b02 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-07-31 22:33:59 +01:00
Tom Christie
6677374e9b Kickstarter sponsors 2014-07-31 22:33:45 +01:00
Xavier Ordoquy
0d2c0ef111 Merge pull request #1724 from kevinlondon/patch-1
Updated Permissions doc link to Django docs
2014-07-31 21:45:25 +02:00
Kevin London
c0f002b09d Updated Permissions doc link to Django docs
The previous link went to version 1 docs so it was a dead link.
2014-07-31 12:41:15 -07:00
Tom Christie
8044416523 Add platinum sponsors 2014-07-31 20:19:28 +01:00
Tom Christie
57d6e04ff5 Add django-rest-framework-mongoengine link. Closes #1722 Closes #1562 Closes #1545 2014-07-30 12:50:36 +01:00
Xavier Ordoquy
983400ddc4 Merge pull request #1720 from tomchristie/feature/django_guardian_cleanup
Django & Django guardian updates
2014-07-29 22:29:58 +02:00
Paul Oswald
66fa40c300 evaluate content at function start 2014-07-29 22:13:11 +09:00
Xavier Ordoquy
5e02f015b8 Better fix for the Django 1.3 compat 2014-07-29 10:30:08 +02:00
Xavier Ordoquy
59d0a0387d Fixed the Django 1.3 compat 2014-07-29 10:20:10 +02:00
Xavier Ordoquy
4210fedd21 Fixed the cache issue with Django 1.7 rc* 2014-07-29 08:35:00 +02:00
Kyle
fc8eb76c22 Issue #1707 - Add info about queryset property caching to get_queryset() docs.
Add documentation to the get_queryset() method of generic-views.md regarding
the caching of the queryset property.
2014-07-28 10:19:42 -07:00
Kyle
e40ffd60d4 Issue #1707 - Add documentation about the caching of GenericAPIView.queryset
to the `queryset` property, `get_queryset()`, and do generic-views.md; remove
changes to the viewsets.md documentation from my last commit.
2014-07-28 10:11:40 -07:00
Xavier Ordoquy
0cbdbd24e5 Updated the tox file. 2014-07-28 13:54:43 +02:00
Paul Oswald
921e4ed2ee Evaluate content before passing to regex.sub
Issue #1708
2014-07-28 16:59:55 +09:00
Xavier Ordoquy
5429c2800e Django-guardian version cleanup. 2014-07-28 08:00:50 +02:00
Xavier Ordoquy
c7a988eb38 Merge remote-tracking branch 'reference/master' 2014-07-28 07:53:04 +02:00
Xavier Ordoquy
fe048dc4fb Fix #1712 (issue when django-guardian is installed but not configured/used) 2014-07-28 07:37:30 +02:00
Kyle Valade
48b02f016a Issue #1707: Add documentation to api-docs.viewsets notifying users
that they should use the get_queryset() method when overriding a
ModelViewSet method, such as list(). Otherwise, since queryset is
a static property, the value will be cached for every instance of
that ViewSet.
2014-07-27 14:01:43 -07:00
Tom Christie
02187eb2ed Merge pull request #1705 from opbeat/master
Sending "Bearer" and "Bearer " resulted in a 500.
2014-07-26 20:57:28 +01:00
Xavier Ordoquy
4876bec9f5 Merge remote-tracking branch 'origin/master' into 2.4.0
Conflicts:
	rest_framework/fields.py
2014-07-26 00:06:56 +02:00
Ron Cohen
e3aff6a567 Updated test docstring related to missing bearer token. 2014-07-25 13:38:42 +00:00
Ron Cohen
05882cc599 Sending "Bearer" and "Bearer " resulted in a 500. 2014-07-25 10:55:53 +00:00
Tom Christie
299a8347e8 Merge pull request #1692 from davbo/patch-1
Update fields.md
2014-07-22 15:59:04 +02:00
Tom Christie
4797b29ed8 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-07-20 15:47:01 +01:00
Tom Christie
81d15aa9be Add link to drf-extra-fields. Closes #1698 2014-07-20 15:45:45 +01:00
Tom Christie
08772799d4 Update README.md 2014-07-18 13:22:29 +01:00
Tom Christie
bf7371fbc5 Update README.md 2014-07-18 13:21:19 +01:00
Tom Christie
591e67f540 Update README.md 2014-07-18 13:21:03 +01:00
Tom Christie
30bf55bf8d Update README.md 2014-07-18 13:20:55 +01:00
Tom Christie
d059b6d6c3 Change positioning of announcement. 2014-07-18 13:20:03 +01:00
Tom Christie
0782640415 Kickstarter announcement 2014-07-18 13:19:28 +01:00
Tom Christie
4324f50437 Phrasing tweak 2014-07-18 11:54:51 +01:00
Tom Christie
ab34ddcf2f Typo 2014-07-18 11:53:23 +01:00
Tom Christie
550243fd26 Beef up the kickstarter announcement 2014-07-18 11:51:48 +01:00
Tom Christie
ead0e60099 Docs for kickstarter announcement 2014-07-17 17:17:41 +01:00
Tom Christie
6bf0f81b0b Kickstarter note on front page 2014-07-17 13:41:19 +01:00
Dave King
680fabe9dd Update fields.md
obj.__class__ will return the actual Class object, we want to serialise a string (accessed with obj.__class__.__name__)
2014-07-17 11:46:59 +01:00
Tom Christie
dd2e950cde Fusion ads 2014-07-15 15:02:09 +01:00
Emmanouil
18eab53e89 Updated quick start project set up order 2014-07-09 15:53:31 +01:00
Tom Christie
b519018125 Docs on object level permissions and filters. Closes #1683 2014-07-07 09:51:23 +01:00
Tom Christie
a5e628bf8b Kick travis 2014-07-07 09:42:50 +01:00
Tom Christie
91eabd54bb Docs tweak 2014-07-01 14:34:23 +01:00
Tom Christie
8eadac39ad Merge pull request #1665 from smal/modelserialization-charfield-with-null
Modelserialization charfield with null
2014-06-27 16:39:54 +01:00
Serhiy Voyt
3326ddc865 Merge branch 'master' into modelserialization-charfield-with-null 2014-06-27 18:10:50 +03:00
Tom Christie
636ae419be Merge pull request #1661 from chibisov/master
Fixes #1651. Add link to drf-extensions nested routers to docs
2014-06-27 14:18:56 +01:00
Chibisov Gennady
c1426d1078 Fixes #1651. Add link to drf-extensions nested routers to docs 2014-06-26 23:29:00 +04:00
Carlton Gibson
d98245ac22 Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559
Conflicts:
	docs/topics/release-notes.md
2014-06-24 10:30:08 +02:00
Carlton Gibson
3f727ce738 Added (first pass) notes to docs & release notes. Backed out SOUTH_MIGRATION_MODULES setting from rest_framework.settings 2014-06-24 09:02:44 +02:00
Carlton Gibson
f34011f801 Allow use of native migrations in 1.7 2014-06-23 14:52:18 +02:00