Tom Christie
bc6c5df109
Minor tweaks
2014-01-13 17:39:22 +00:00
Tom Christie
e91d0a69ab
Merge branch 'testing-nested-serializers' of git://github.com/dustinfarris/django-rest-framework into dustinfarris-testing-nested-serializers
2014-01-13 17:38:03 +00:00
Tom Christie
d937ce331c
Minor cleanup
2014-01-13 17:37:08 +00:00
Dustin Farris
c4d77667cf
Move ImportingModelSerializerTests and add comments.
2014-01-13 12:03:13 -05:00
Tom Christie
73d8a2bcbd
Merge branch 'master' of git://github.com/cguethle/django-rest-framework into cguethle-master
2014-01-13 16:52:19 +00:00
Dustin Farris
b1b58762a3
Move models.resolve_model to serializers._resolve_model
2014-01-13 11:47:44 -05:00
Tom Christie
2ecd984172
Merge pull request #1343 from linovia/hotfix/1129
...
Fix for #1129
2014-01-13 01:32:09 -08:00
Dustin Farris
2332382b51
Add a sanity check to avoid running into unresolved related models.
2014-01-12 20:28:19 -05: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
Xavier Ordoquy
f217f6870d
Removed useless try/except
2014-01-09 23:32:50 +01:00
Xavier Ordoquy
a7072eb730
Test case for #1129
2014-01-09 23:19:25 +01:00
Tom Christie
593cf23ac8
Merge pull request #1342 from yprez/fix_field_doc
...
Fix URL/Slug Field signatures in docs
2014-01-09 09:21:35 -08:00
Dustin Farris
bf5b77ce6d
Move serializer import to top-level causes test error
2014-01-09 11:42:41 -05:00
Yuri Prezument
052e236fde
Fix URL/Slug Field signatures in docs
2014-01-09 18:12:30 +02:00
Tom Christie
c6182b78e5
Merge pull request #1341 from fredrikmollerstrand/docstring-typo-fix
...
fix docstring typos.
2014-01-09 07:51:02 -08:00
Fredrik Möllerstrand
82a48ca55e
fix docstring typos.
2014-01-09 15:41:20 +00:00
Dustin Farris
52db4eadc2
Testing nested serializers with models that have str foreign key references.
2014-01-08 16:14:27 -05:00
Tom Christie
05c396cfa1
Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains
2014-01-08 15:49:19 +00: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
Tom Christie
b0ddf21bd0
Drop the logo from the project README
2014-01-07 15:02:56 +00:00
Tom Christie
3920d589b0
Center logo
2014-01-07 15:01:21 +00:00
Tom Christie
5213cb7cf5
Merge branch 'logo'
2014-01-07 14:58:29 +00:00
Tom Christie
2b033d2456
New font in logo
2014-01-07 14:57:00 +00:00
Tom Christie
e3ae33017d
Added "nofollow" against docs link.
2014-01-06 15:01:45 +00:00
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
