Jiali Chen
d6645a0df9
resolve conflict
2014-08-12 00:22:12 +08:00
Jiali Chen
43546129ff
change the dumps and loads hooks to accept string
...
The JSONRender and JSONParser need to be JSON serializable themselves,
so the loads_function and dumps_function are changed to accept strings
to work around it.
2014-08-11 23:49:46 +08:00
Jiali Chen
85e92b613b
add json.dumps and json.loads hook
...
Add properties for json.dumps and json.loads functions in JSONParser
and JSONRenderer class respectively. The classes can be easily extended
by providing custom dumps and/or loads functions.
2014-08-11 21:03:29 +08:00
Tom Christie
c6326d0a67
Merge pull request #1745 from nemesisdesign/patch-4
...
docs: add reference to gis serializer
2014-08-09 07:41:37 +01:00
Tom Christie
8e7e09626a
Merge pull request #1744 from nemesisdesign/patch-3
...
docs: add reference to DRF-gis in fields
2014-08-09 07:40:49 +01:00
Federico Capoano
c462a43a87
docs: added reference to gis serializer
...
added reference to GeoFeatureModelSerializer of django-rest-framework-gis
2014-08-08 14:39:56 +02:00
Federico Capoano
5eb901cd2a
docs: added reference to DRF-gis in fields
...
added django-rest-framework-gis to third party packages section in /docs/api-guide/fields.md
2014-08-08 14:25:02 +02:00
Tom Christie
ec6f9f1518
Merge pull request #1740 from kevinlondon/patch-4
...
Updated links to Bootstrap components
2014-08-08 00:43:10 +01:00
Kevin London
bc03d2b553
Updated links to Bootstrap components
...
The previous links landed on the the main page and no longer directly linked to specific areas.
2014-08-07 16:32:40 -07:00
Tom Christie
31591d6cfc
Merge pull request #1737 from kevinlondon/patch-2
...
Include query parameter override instructions for OrderingFilter
2014-08-07 09:11:17 +01:00
Kevin London
617745eca0
Update description of OrderingFilter
...
I added a brief description of how you could specify a different query parameter for the OrderingFilter.
2014-08-06 16:26:56 -07:00
Tom Christie
4086e0562c
Merge pull request #1736 from robbyt/patch-2
...
minor doc fix, @api_view() needs an iterable
2014-08-07 00:10:51 +01:00
Rob Terhaar
3217842346
minor doc fix, @api_view() needs an iterable
2014-08-06 18:55:08 -04:00
Tom Christie
5ba2962036
Merge pull request #1733 from nimiq/patch-1
...
Fix style for some text
2014-08-06 12:48:55 +01:00
nimiq
62d0d4e5d2
Fix style for some text
2014-08-06 12:45:58 +02:00
Tom Christie
0ae55902ee
Merge pull request #1732 from jalan/master
...
Remove duplicate class attributes
2014-08-05 17:40:04 +01:00
Tom Christie
83597a4b0f
Latest sponsor update
2014-08-05 15:31:39 +01:00
Jason Alan Palmer
2d6469348d
Remove duplicate class attributes
...
These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style
2014-08-05 10:25:48 -04:00
Tom Christie
322476c386
Latest sponsor update
2014-08-04 09:20:27 +01:00
Tom Christie
7bc9954fdb
Update sponsorships
2014-08-02 15:28:34 +01:00
Tom Christie
d0fdcdfdad
Added pathwright
2014-08-02 15:18:03 +01:00
Tom Christie
3ac075a227
Update Nephila sponsorship
2014-08-02 15:08:14 +01:00
Tom Christie
f58dde59c4
Sponsor updated
2014-08-02 15:05:03 +01:00
Tom Christie
9af3dc0ba5
Added ProReNata AB
2014-08-01 13:54:26 +01:00
Tom Christie
5377bda942
Fix LaterPay link
2014-08-01 13:42:51 +01:00
Tom Christie
27af7a3f4f
Latest sponsor updates
2014-08-01 11:36:33 +01:00
Tom Christie
f87aadb3ce
Latest sponsor updates
2014-08-01 11:35:48 +01:00
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
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
Xavier Ordoquy
0cbdbd24e5
Updated the tox file.
2014-07-28 13:54:43 +02: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
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
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
