encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-14 05:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,539 Commits 18 Branches 132 Tags 104 MiB
c1802db1eb
Commit Graph

6539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
2d0b54e263 Merge branch 'drop-django-16' oft https://github.com/carltongibson/django-rest-framework into carltongibson-drop-django-16 
Conflicts:
	docs/topics/release-notes.md
 2015-09-28 11:17:48 +01:00
Tom Christie
4762a73e34 Merge pull request #3342 from tomchristie/version-3.3 
Compat updates for version 3.3
 2015-09-28 11:06:42 +01:00
Tom Christie
ca8313aeac Merge branch 'master' into version-3.3 
Conflicts:
	docs/topics/release-notes.md
 2015-09-28 10:57:14 +01:00
Tom Christie
6284bceaaf Merge pull request #3363 from tomchristie/dont-access-settings-on-import 
Access settings lazily, not at module import.
 2015-09-24 15:42:31 +01:00
Tom Christie
509c54de9b Merge pull request #3435 from stianjensen/unique-error 
Use model error_messages when available
 2015-09-24 13:10:14 +01:00
José Padilla
c28bc9896e Merge pull request #3433 from atombrella/base_html_fix 
fixing a trivial HTML tag which is closed twice
 2015-09-23 11:56:16 -04:00
Stian Jensen
62c000bc12 Use model error_messages when available 
In the automatically applied UniqueValidator, use the error message from
error_messages defined in the model instead of the generic default
UniqueValidator message.

This fixes #2878.
 2015-09-23 15:20:44 +02:00
Tom Christie
51443166a8 Merge pull request #3431 from paolopaolopaolo/issue-3265 
Guard against calling `serializer.data` before `serializer.save()`
 2015-09-23 09:51:54 +01:00
Mads Jensen
8a82a07f8d fixing a trivial HTML tag which is closed twice 2015-09-23 10:51:23 +02:00
Xavier Ordoquy
7661398a4a Merge pull request #3420 from linovia/release/3.2.4 
Release/3.2.4
 2015-09-23 01:51:07 +02:00
paolopaolopaolo
7640bfea9e Add assert statement to .save() method in Serializer: 
- Asserts that `_data` does not exist when calling `.save()`
 2015-09-22 11:49:51 -07:00
paolopaolopaolo
134f5fa4bc Fixes #3265 (now with Test Case) 
- Added test_data_access_before_save_raises_error test
 2015-09-22 11:40:19 -07:00
Carlton Gibson
8d740a11e4 Adjust README and Release Notes 2015-09-22 16:39:25 +02:00
Carlton Gibson
45ace5010e Remove OrderedDict fallback 2015-09-22 16:35:38 +02:00
Carlton Gibson
0b34408172 Remove unittest.skipUnless 2015-09-22 16:24:22 +02:00
Carlton Gibson
6e86a53c92 Remove apps.get_model fallback 
* Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests`
 2015-09-22 16:14:45 +02:00
Carlton Gibson
68c88e180f Remove ContentType import fallback 2015-09-22 15:55:39 +02:00
Carlton Gibson
5c0dffa4f7 Remove Django 1.6 from test matrix 2015-09-22 15:39:51 +02:00
Tom Christie
eccf7cc7ac Merge pull request #3427 from carltongibson/exlude-guardian 
Exclude Guardian testing against Django master
 2015-09-22 14:32:42 +01:00
Carlton Gibson
524a28c6f8 Exclude Guardian testing against Django master 2015-09-22 15:14:25 +02:00
Tom Christie
5b2b675a21 Merge pull request #3421 from carltongibson/supported-versions-2 
Drop Django 1.5
 2015-09-22 12:48:11 +01:00
Tom Christie
41b796d844 Merge pull request #3426 from uruz/feature/fix-typo 
Typo in test method name
 2015-09-22 10:26:38 +01:00
Alexey Boriskin
0155a44aac Typo in test method name 2015-09-22 12:13:01 +03:00
Carlton Gibson
2aa33ed544 Adjust README and Release Notes 2015-09-21 20:23:39 +02:00
Carlton Gibson
8ea1606abf Remove Django 1.5 clean_manytomany_helptext fallback 2015-09-21 20:16:52 +02:00
Carlton Gibson
25de8c960f Remove Django 1.5 get_model_name fallback 2015-09-21 20:10:31 +02:00
Carlton Gibson
4a1ab3c18c Fix isort errors 2015-09-21 16:29:33 +02:00
Carlton Gibson
e625cff8a5 Remove Django 1.5 URLValidator fallback 2015-09-21 16:22:46 +02:00
Carlton Gibson
9216dc9a25 Remove Django 1.5 EmailValidator fallback 2015-09-21 16:20:07 +02:00
Carlton Gibson
8edb9d3c1f Drop testing against Django 1.5 2015-09-21 16:08:56 +02:00
Carlton Gibson
366dff4f26 Test Python 3.5 against Django master 2015-09-21 16:03:37 +02:00
Carlton Gibson
796baab86f Drop Pythons 3.2, 3.3 for Django master 
No longer supported
 2015-09-21 15:47:11 +02:00
Xavier Ordoquy
6ee3e29460 Add #3415 to the 3.2.4 release 2015-09-21 13:28:59 +02:00
Xavier Ordoquy
1054ea559c Fix the issue link. 2015-09-21 13:28:37 +02:00
Xavier Ordoquy
26715c2dae Merge remote-tracking branch 'origin/master' into release/3.2.4 2015-09-21 13:25:49 +02:00
Xavier Ordoquy
f2c65512c6 Merge pull request #3415 from adamsc64/issue_2761 
Fixed #2761 - ListField truncation on HTTP PATCH
 2015-09-21 13:06:44 +02:00
Xavier Ordoquy
089b8af4c1 Update the translations. 2015-09-21 08:07:56 +02:00
Xavier Ordoquy
d0510438b2 Bump version to 3.2.4. 2015-09-20 22:04:25 +02:00
Xavier Ordoquy
d85e7b9ccc Update Release notes for 3.2.4. 2015-09-20 22:03:52 +02:00
Xavier Ordoquy
df26614e85 Translation update. 2015-09-20 21:59:47 +02:00
Christopher Adams
9ccfc94077 Fixed #2761 - ListField truncation on HTTP PATCH 
- Checked ``partial`` state when getting value in appropriate field
  classes; return ``empty`` immediately if key not submitted.
 2015-09-19 10:18:04 -04:00
Christopher Adams
cb42b995fa Proof of bug #2761 
- When not submitting key for list fields or multiple choice, partial
  serialization should result in empty state (key not there), not an
  empty list.
 2015-09-19 10:17:57 -04:00
Tom Christie
eec1156f63 AJAX forms in admin interface 2015-09-17 16:53:28 +01:00
Tom Christie
b8ebe29844 Import sorting 2015-09-17 16:40:47 +01:00
Tom Christie
343fd5ec3d Merge branch 'canassa-method-not-allowed-not-raised' into remove-content-overriding 2015-09-17 16:39:30 +01:00
Tom Christie
66e372200f Merge branch 'method-not-allowed-not-raised' of https://github.com/canassa/django-rest-framework into canassa-method-not-allowed-not-raised 2015-09-17 16:38:42 +01:00
Tom Christie
4b4130e8b2 Fix request cloning, so method becomes set 2015-09-17 16:34:03 +01:00
Xavier Ordoquy
b1a5294a1a Merge pull request #3411 from yiyocx/patch-1 
Improved Serializer relations docs
 2015-09-17 17:33:53 +02:00
Yiyo
7df11078ee Improved Serializer relations docs 2015-09-17 10:30:22 -05:00
Tom Christie
a3067bea55 Merge branch 'master' into version-3.3 2015-09-17 16:24:46 +01:00