Tom Christie
399e4d9b08
Merge branch 'master' into logo
2014-01-03 13:27:00 +00:00
Tom Christie
442916b964
Link to BrightAPI, and remove ad except from frontpage
2014-01-03 13:24:52 +00:00
Tom Christie
3050f0e82a
Frontpage tweaks
2014-01-03 13:06:41 +00:00
Tom Christie
c3f8c8ffde
Merge pull request #1329 from estebistec/fix-serializer-from-native-sig
...
FIX BaseSerializer.from_native has an altered signature
2014-01-02 23:27:26 -08:00
Tom Christie
4caa9416e5
Merge pull request #1325 from kevin-brown/compat_fix
...
Fix bugfix note
2014-01-02 23:26:25 -08:00
Steven Cummings
e020c51b44
FIX BaseSerializer.from_native has an altered signature
...
* base classes define it with one parameter
* BaseSerializer currently defines a second parameter, which we make optional here for method-dispatch passivity
2014-01-02 17:18:08 -06:00
Tom Christie
12d1544101
Merge pull request #1327 from bodylabs/tox_link
...
FIx link to tox
2014-01-02 14:24:51 -08:00
Paul Melnikow
e032bad1a7
FIx link to tox
2014-01-02 16:54:06 -05:00
Kevin Brown
0672d6de6e
Fix bugfix note
...
This fixes a bugfix note that was added because of #1293 , which
pointed out that a change in a bugfix [1] broke backwards
compatibility. The bugfix did not work as expected because a
variable was quoted when it should not have been. This removes
the quotes around the variable, which brings back the expected
functionality.
2014-01-02 16:46:57 -05:00
Tom Christie
2921455ea7
Merge pull request #1318 from sheppard/generic-dj16
...
saving nested generic relation serializers broken in django 1.6
2014-01-02 01:44:49 -08:00
Tom Christie
1f3f2741f5
Happy new year
2014-01-02 09:28:34 +00:00
S. Andrew Sheppard
d30ce2575c
fix for genericrelation saving
2013-12-23 22:31:31 -06:00
S. Andrew Sheppard
25bd6d1d4b
can't save genericrelations via nested serializers in django 1.6
2013-12-23 22:27:40 -06: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
333814e29c
Merge branch 'patch-1' of git://github.com/bennbollay/django-rest-framework into bennbollay-patch-2
2013-12-23 12:35:44 +00:00
Tom Christie
feddd16c54
Tweak test style
2013-12-23 12:04:17 +00:00
Tom Christie
bed2f08c24
Updated release notes
2013-12-23 11:57:25 +00:00
Tom Christie
3f5e3c28f5
Updated tests to pass in python 3
2013-12-23 11:55:25 +00:00
Tom Christie
9d281e187a
Merge branch 'master' of git://github.com/flisky/django-rest-framework into flisky-master
2013-12-23 10:47:20 +00:00
Tom Christie
d8a95b4b6d
Back out permissions example change in favor of easier to follow example
2013-12-23 09:12:34 +00:00
Tom Christie
c385723648
Merge pull request #1315 from amatellanes/master
...
Simplified some examples in tutorial
2013-12-23 01:10:13 -08:00
amatellanes
2846ddb5d2
Simplified some examples in tutorial
2013-12-23 09:06:03 +01:00
amatellanes
67a2b5a8cb
Merge remote-tracking branch 'upstream/master'
2013-12-23 09:00:28 +01:00
amatellanes
74f1cf6355
Revert "Simplified some examples in tutorial"
...
This reverts commit d6806340e5
2013-12-23 08:56:34 +01:00
amatellanes
d6806340e5
Simplified some examples in tutorial
2013-12-23 08:50:46 +01:00
Yin Jifeng
80e9f0d64b
fix url double quoted in Django 1.6
...
get_full_path returns unicode, so we use build_absolute_uri which
returns iri_to_uri'ed one
2013-12-23 14:33:53 +08:00
bennbollay
e5caf48a12
Change the page title to prioritize page content
...
When many tab's are open (which is necessary for DRF's documentation), it becomes impossible to determine which tab contains which pieces of documentation. That they are all related is obvious by the use of a common icon, just not the specific page each tab is loaded to.
This change inverts the order of the title to maintain as much useful context as possible on the tabbar.
2013-12-22 16:53:52 -08:00
Tom Christie
9b7341e484
Merge pull request #1312 from amatellanes/master
...
Simplified some functions in permissions.py
2013-12-22 04:53:00 -08:00
amatellanes
2d6d725c2f
Simplified some functions
2013-12-22 12:39:47 +01:00
Tom Christie
b7482629c3
Merge pull request #1309 from lukaszb/errors-for-renamed-fields
...
Should it be that way?
2013-12-21 13:58:49 -08:00
Tom Christie
71ab7cda2a
Additional test for 'source' behaviour. Refs #1302
2013-12-21 21:54:51 +00:00
Tom Christie
a439c80cd8
Less brittle through relationship testing. Closes #1292 .
2013-12-21 21:21:53 +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
Tom Christie
e6fac63536
Merge pull request #1310 from vbabiy/adding-djangorestframework-camel-case-to-docs
...
djangorestframework-camel-case in docs
2013-12-21 09:12:50 -08: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
Lukasz Balcerzak
973f898a4b
Should it be that way?
2013-12-20 17:45:56 +01:00
Tom Christie
46906b2bdc
Merge pull request #1308 from lukaszb/missing-custom-validation-method-test
...
Added missing custom validation method test
2013-12-20 08:37:30 -08:00
Lukasz Balcerzak
71aa5f3c45
Added missing custom validation method test
2013-12-20 17:16:24 +01:00
Tom Christie
c66b0f8835
Merge pull request #1307 from lukaszb/test-class-name-duplicated
...
Updated test class name to be unique
2013-12-20 08:13:09 -08:00
Lukasz Balcerzak
0e3822d6e0
Updated test class name to be unique
2013-12-20 16:53:06 +01:00
Tom Christie
02ae1682b5
Add note on compat import in tutorial
2013-12-17 09:45:28 +00:00
Tom Christie
7bdb1b2eef
Merge pull request #1301 from linovia/bugfix/tutorial_for_python3
...
Fix tutorial's step 1 for Python 3
2013-12-17 01:42:47 -08:00
Xavier Ordoquy
8026480454
Use the BytesIO for buffering bytes and import the one from the compat module.
2013-12-17 10:30:23 +01:00
Tom Christie
8894019899
Merge branch 'nullbooleanfield_testcase' of git://github.com/dpetzel/django-rest-framework into dpetzel-nullbooleanfield_testcase
...
Conflicts:
rest_framework/tests/test_serializer.py
2013-12-16 13:51:57 +00:00
Tom Christie
0f37260254
Merge pull request #1184 from dpetzel/nullbooleanfield_fix
...
Fix infered field type for models.NullBooleanField
2013-12-16 05:50:10 -08:00
Tom Christie
4f58263cd1
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-12-16 11:59:49 +00:00
Tom Christie
f0f7a91b31
Add CONTRIBUTING.md
2013-12-16 11:59:37 +00:00
Tom Christie
31dd160256
Typo
2013-12-16 11:59:14 +00:00
