Dustin Farris
2111a99b32
Update link for ember-django-adapter
2015-02-01 16:00:24 -05:00
José Padilla
d6153a7fae
Merge pull request #2497 from jpadilla/master
...
Fix base_template examples
2015-02-01 16:48:22 -04:00
José Padilla
9437d9b8ee
Fix base_template name in example
2015-02-01 16:18:40 -04:00
José Padilla
aaa1fcd5d1
Fixes #2493
2015-02-01 16:18:02 -04:00
José Padilla
b844cc4bb6
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
...
Conflicts:
rest_framework/serializers.py
2015-02-01 15:34:33 -04:00
José Padilla
37dce89354
Add support for Django 1.8’s ArrayField
2015-02-01 15:33:34 -04:00
Tom Christie
e63f49bd1d
Fix field mappings for 1.8 fields
2015-01-31 19:59:52 +00:00
Tom Christie
a89e05dc73
Merge pull request #2492 from tomchristie/empty_closable_objects
...
_closable_objects as an empty list, not deleted
2015-01-31 14:30:00 +00:00
Tom Christie
2cc4cb2465
Fix error text in test.
2015-01-31 08:53:40 +00:00
Tom Christie
53b29f0902
_closable_objects as an empty list, not deleted
2015-01-31 08:27:17 +00:00
Tom Christie
6838f17325
Add built-in translations.
2015-01-30 16:41:21 +00:00
Tom Christie
0d96cf2ca2
Latest translation source messages.
2015-01-30 16:27:49 +00:00
Tom Christie
ee2f2d6baa
Added 1.8-alpha to supported list.
2015-01-30 15:58:33 +00:00
José Padilla
760b25bc20
Fix AttributeError on renamed _field_mapping
2015-01-30 11:36:03 -04:00
Tom Christie
4ee4b4f2dc
Merge master
2015-01-30 14:00:25 +00:00
Tom Christie
7cf9dea7f9
Docs typo. Closes #2491 .
2015-01-30 11:00:29 +00:00
Tom Christie
2a43d9db87
Merge pull request #2486 from maryokhin/master
...
Cleanup '.model' shortcut from code and docs
2015-01-29 21:25:07 +00:00
Tymur Maryokhin
e720927b78
Removed deprecated '.model' docs
2015-01-29 17:28:18 +01:00
Tymur Maryokhin
ba7dca893c
Removed router check for deprecated '.model' attribute
2015-01-29 17:28:03 +01:00
Tom Christie
60a63ffd29
Merge pull request #2482 from mareknaskret/patch-1
...
Update filtering.md
2015-01-28 14:21:56 +00:00
mareknaskret
4a2a36ef82
Update filtering.md
...
Updated links for django-guardian package.
2015-01-28 15:17:56 +01:00
Tom Christie
6d89430dd2
Merge pull request #2475 from sdreher/master
...
ManyRelatedField.get_value clearing field on partial update
2015-01-28 09:26:49 +00:00
Tom Christie
81c2562ec4
Merge pull request #2479 from lucaswiman/custom_user_shim_db_table
...
Use the proper db_table argument when constructing meta
2015-01-28 09:20:27 +00:00
Tom Christie
761f264f59
Merge pull request #2473 from tomchristie/reload-settings
...
Reload api_settings when using Django's 'override_settings'
2015-01-28 09:05:51 +00:00
Lucas Wiman
a1eba885e2
Use the proper db_table argument when constructing meta
2015-01-27 19:30:44 -08:00
José Padilla
8f33e39f62
Merge pull request #2478 from brandoncazander/version-3.1
...
Clone the versioning_scheme when necessary. Fixes #2477
2015-01-27 21:21:42 -04:00
Brandon Cazander
ac87490b91
Clone the versioning_scheme when necessary. Fixes #2477
2015-01-27 17:10:17 -08:00
Xavier Ordoquy
0daf160946
Fix #2476
2015-01-28 00:06:34 +01:00
Xavier Ordoquy
cf8a09993f
Merge pull request #2474 from linovia/release/3.0.4
...
Release notes for 3.0.4
2015-01-27 23:07:37 +01:00
Susan Dreher
e7da266a86
reorganize imports
2015-01-27 16:32:15 -05:00
Susan Dreher
1714ceae9f
reorganize imports
2015-01-27 16:31:25 -05:00
Susan Dreher
8c3f82fb18
🐛 ManyRelatedField get_value clearing field on partial update
...
A PATCH to a serializer's non-related CharField was clearing an ancillary StringRelatedField(many=True) field.
The issue appears to be in the ManyRelatedField's get_value method, which was returning a [] instead of empty
when the request data was a MultiDict.
This fix mirrors code in fields.py, class Field, get_value, Ln. 272, which explicitly returns empty on a partial update.
Tests added to demonstrate the issue.
2015-01-27 16:18:51 -05:00
Xavier Ordoquy
5b369bf5fe
Bumped the version.
2015-01-27 19:45:37 +01:00
Xavier Ordoquy
925ea4bdc6
Release notes for 3.0.4
2015-01-27 19:43:38 +01:00
Tom Christie
65bca59ea5
Reload api_settings when using Django's 'override_settings'
2015-01-27 13:51:30 +00:00
Tom Christie
107198af94
Merge pull request #2456 from brandoncazander/version-3.1
...
Fix AttributeError on BrowsableAPI when checking for API version
2015-01-27 09:09:59 +00:00
Brandon Cazander
bf58c1265d
Set a version attribute on cloned requests if necessary.
2015-01-26 22:56:57 -08:00
Tom Christie
fc70c0862f
Galileo Press -> Rheinwerk Verlag
2015-01-26 14:07:21 +00:00
Michael Marvick
73bd0d539f
tutorial #5 incorrectly referenced 'settings.py' instead of 'tutorial/settings.py'
2015-01-25 23:47:01 -08:00
Michael Marvick
2a6937f381
tutorial #2 incorrectly showed /item.json instead of /item/.json for format suffixes
2015-01-25 23:46:27 -08:00
Michael Marvick
90c9968a70
tutorial #1 incorrectly showed string of json instead of ReturnDict type from 'serializer.data', and also has a third item in the second usage
2015-01-25 23:45:56 -08:00
José Padilla
221a28ff92
Merge pull request #2458 from jfw/patch-3
...
typo in fields.md
2015-01-25 09:42:41 -04:00
Jeff Fein-Worton
0a65913fea
typo in fields.md
2015-01-24 18:34:16 -08:00
Kevin Brown
9687f4ffae
Merge pull request #2457 from jfw/patch-3
...
minor typo in viewsets docs
2015-01-24 16:30:53 -05:00
Jeff Fein-Worton
39da9c7c86
minor typo in viewsets docs
2015-01-24 12:53:21 -08:00
Brandon Cazander
6c083b12a1
Streamline test for #2455
2015-01-24 11:00:36 -08:00
Brandon Cazander
ed04725822
Use enhanced request when cloning requests for checking permissions on other methods. Fixes #2455
2015-01-24 01:44:40 -08:00
Brandon Cazander
0ee2edc0a1
Add missed files for test.
2015-01-24 01:44:09 -08:00
Brandon Cazander
b09ef28959
Add failing test for request.version AttributeError in BrowsableAPI.
2015-01-24 01:37:23 -08:00
Tom Christie
0cb5acee75
Merge pull request #2453 from alexsdutton/data-and-files-none-data
...
Pass {} as data to DataAndFiles, as it ends up in a MergeDict
2015-01-23 18:03:40 +00:00
