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
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
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
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
83b31e7ea2
Merge branch 'patch-1' of git://github.com/bennbollay/django-rest-framework into bennbollay-patch-1
2013-12-23 09:20:59 +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