encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 05:24:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,180 Commits 18 Branches 132 Tags 105 MiB
407480b484
Commit Graph

5180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
407480b484 Minor docs work 2015-02-09 17:01:41 +00:00
Tom Christie
0240df1a38 Minor internal API cleanpu 2015-02-06 16:15:10 +00:00
Tom Christie
670723f021 Minor cleanups/improvements to ModelSerializer API 2015-02-06 15:45:02 +00:00
Tom Christie
5d8c3abe72 Fix typo 2015-02-06 15:27:35 +00:00
Tom Christie
dec3493d7c Minor cleanup 2015-02-06 14:43:43 +00:00
Tom Christie
a435b1b355 Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1 2015-02-06 14:39:31 +00:00
Tom Christie
1f99612845 Upgrade pending deprecations to deprecations 2015-02-06 13:21:35 +00:00
Tom Christie
1d4956f616 Pagination images 2015-02-06 13:08:04 +00:00
Tom Christie
53716f6152 Internationalization docs 2015-02-06 11:37:29 +00:00
José Padilla
7f801b9a01 Add trim_whitespace to CharField #2517 
If set to `True` then leading and trailing
whitespace is trimmed. Defaults to `True`.
 2015-02-06 01:09:19 -04:00
Tom Christie
09488ad4da Link to ModelSerializer API 2015-02-06 00:25:03 +00:00
Tom Christie
1fdfea2758 Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1 2015-02-06 00:05:59 +00:00
Tom Christie
b11a98f1e7 Tweak gitignore 2015-02-06 00:05:42 +00:00
Tom Christie
6c63ef13cd Drop 2.x announcements 2015-02-06 00:04:20 +00:00
Tom Christie
f1e7ce54a1 Merge pull request #2496 from jpadilla/version-3.1 
Support for Django 1.8 ArrayField
 2015-02-05 14:49:19 +00:00
José Padilla
c696b0ba0c Fix possible nested array fields 2015-02-05 10:12:14 -04:00
José Padilla
720d154c83 Merge remote-tracking branch 'upstream/version-3.1' into version-3.1 2015-02-04 23:34:20 -04:00
José Padilla
48fa77c09e Add child to ListField when using ArrayField 2015-02-04 23:33:59 -04:00
Tom Christie
f98f842827 Minor bits of test cleanup 2015-02-05 01:24:55 +00:00
Tom Christie
65bbc4a159 Merge branch 'brandoncazander-version-3.1-2489' into version-3.1 2015-02-05 00:58:16 +00:00
Tom Christie
e1c4513312 Fix NamespaceVersioning with hyperlinked serializer fields 2015-02-05 00:58:09 +00:00
Tom Christie
83673e8f74 Merge branch 'version-3.1-2489' of git://github.com/brandoncazander/django-rest-framework into brandoncazander-version-3.1-2489 2015-02-04 23:32:48 +00:00
Tom Christie
41b213414d Updating release notes 2015-02-04 23:32:25 +00:00
Tom Christie
a0374e4498 Remove erronous checkin 2015-02-04 09:08:43 +00:00
Tom Christie
8b4ce5c636 Minor authentication message improvement. 2015-02-04 09:07:10 +00:00
Brandon Cazander
030f01afdb Reorganize tests. 2015-02-03 02:14:38 -08:00
Tom Christie
d015534d53 Fleshing out 3.1 announcement 2015-02-03 09:15:42 +00:00
Brandon Cazander
f3067a7fab Remove unnecessary APIRequestFactory get from tests. 2015-02-02 20:41:06 -08:00
Brandon Cazander
77d061d234 Provide rest_framework.resolve. Fixes #2489 2015-02-02 20:37:33 -08: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
2cc4cb2465 Fix error text in test. 2015-01-31 08:53:40 +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
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