encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 04:07:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,075 Commits 18 Branches 132 Tags 104 MiB
ae84b8b0e8
Commit Graph

4075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timo Tuominen
ae84b8b0e8 Traverse the method resolution order when mapping serializer fields. 2014-09-01 15:03:39 +03:00
Timo Tuominen
82d4b20832 Add subclass matching to serializer field mapping. 2014-09-01 15:02:49 +03:00
Tom Christie
b40525d8e6 Merge pull request #1817 from tituomin/testing-requirements-documentation 
Correct testing documentation details.
 2014-09-01 12:23:02 +01:00
Timo Tuominen
278df84a7c Correct testing documentation details. 2014-09-01 12:14:26 +03:00
Carlton Gibson
14877464f6 Merge pull request #1816 from carltongibson/regression-login-template 
Regression for #1810: Test login view renders
 2014-09-01 10:31:07 +02:00
Carlton Gibson
0e51dab8f4 Comform to flake8 2014-09-01 10:09:46 +02:00
Tom Christie
55e779c856 Version 2.4.1 2014-09-01 09:07:55 +01:00
Carlton Gibson
1c9c5d5c32 Regression for #1810: Test login view renders 2014-09-01 10:07:05 +02:00
Tom Christie
f777a73bc7 Merge pull request #1810 from danielroseman/restore-body-block 
Restore body block to base template.
 2014-09-01 08:54:58 +01:00
Xavier Ordoquy
bbc2749ee6 Merge pull request #1812 from linovia/bugfix/1804 
Fix #1804
 2014-08-31 03:44:10 +02:00
Xavier Ordoquy
4dd4538069 Exclude the pyc, pyo files and __pycache__ directories from packaging (thanks to Kevin Brown). 2014-08-31 03:39:34 +02:00
Daniel Roseman
b554c67d14 Restore body block to base template. 2014-08-30 13:28:12 +01:00
Tom Christie
efaa37376c Update README.md 2014-08-29 14:01:54 +01:00
Tom Christie
5490fc2700 Fix links in 2.4 release 2014-08-29 13:29:51 +01:00
Jamie Matthews
baceb528cb Fix typos in 2.4 release notes 2014-08-29 11:11:18 +01:00
Tom Christie
572107281f Typo in 2.4 announcement name 2014-08-29 10:15:55 +01:00
Tom Christie
2a61ed8bac 2.4 Release notes 2014-08-29 10:10:17 +01:00
Tom Christie
8f4ae06b3b Merge pull request #1784 from tomchristie/remove-model-attribute 
Deprecate `.model` attribute on views
 2014-08-29 10:03:07 +01:00
Tom Christie
bb1604674f Minor docs update 2014-08-29 09:21:10 +01:00
Tom Christie
95093a982e Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-08-29 09:20:51 +01:00
Carlton Gibson
b88046eb64 Merge pull request #1788 from cezar77/fix-1719 
Browsable API cleanups. Fixes #1719
 2014-08-29 10:05:30 +02:00
Tom Christie
e7e3d29de4 Sponsor fix 2014-08-28 17:35:45 +01:00
Tom Christie
2536b93c03 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-08-28 17:02:37 +01:00
Tom Christie
73bd408f78 Latest sponsor update 2014-08-28 17:01:58 +01:00
Carlton Gibson
960fa425bf Merge pull request #1795 from lnhubbell/patch-2 
Update generic-views.md
 2014-08-28 14:12:24 +02:00
Cezar Pendarovski
5380889275 Validation errors in the rendered HTML fixed 2014-08-28 10:39:01 +02:00
Nathan Hubbell
be21cafd2b Update generic-views.md 
Small grammar changes.
 2014-08-27 17:57:40 -07:00
Cezar Pendarovski
e5d88a80a9 Put all TextNodes (method names) back to same line with parent element 2014-08-27 09:41:33 +02:00
Carlton Gibson
0724c557b1 Merge pull request #1792 from lnhubbell/patch-1 
Update generic-views.md
 2014-08-27 09:29:14 +02:00
Cezar Pendarovski
8c9b795296 Merge remote-tracking branch 'upstream/master' into fix-1719 2014-08-27 08:43:36 +02:00
Nathan Hubbell
19076510f4 Update generic-views.md 2014-08-26 17:31:08 -07:00
Carlton Gibson
c29c75da28 Merge pull request #1789 from nemesisdesign/patch-5 
docs: added drf-hstore to third party fields
 2014-08-26 11:19:48 +02:00
Carlton Gibson
65fda642f9 Merge pull request #1790 from nemesisdesign/patch-6 
docs: added HStoreSerializer to third party serializers
 2014-08-26 11:19:30 +02:00
Cezar Pendarovski
f6cbd88618 Merge remote-tracking branch 'upstream/master' into fix-1719 
Conflicts:
	rest_framework/templates/rest_framework/base.html
 2014-08-25 17:28:22 +02:00
Federico Capoano
eb81c55d16 docs: added HStoreSerializer to third party serializers 
added a reference to django-rest-framework-hstore in docs/api-guide/serializers.md
 2014-08-25 12:32:44 +02:00
Federico Capoano
8e3f7700f6 docs: added drf-hstore to third party fields 
added a reference to django-rest-framework-hstore in docs/api-guide/fields.md
 2014-08-25 12:29:10 +02:00
Cezar Pendarovski
4d582fd9ff Made all color declarations in bootstrap-tweaks.css consistent 2014-08-22 10:12:52 +02:00
Cezar Pendarovski
1e2bd1294e Fixed the issue with the non-draggable horizontal scrollbar 2014-08-22 09:53:03 +02:00
Tom Christie
8b2052172c Add .model deprecation to release notes 2014-08-21 12:25:20 +01:00
Tom Christie
21a0a826bb Add Retry-After to release notes. Refs #1508. 2014-08-20 17:34:51 +01:00
Tom Christie
3de09f1df0 Merge pull request #1508 from uploadcare/set-retry-after 
set Retry-After header when throttled
 2014-08-20 17:29:43 +01:00
Tom Christie
6953a5ecec Typo 2014-08-20 17:16:47 +01:00
Tom Christie
4d8c63abc9 Deprecate .model in related routers/permissions 2014-08-20 17:15:46 +01:00
Dmitry Mukhin
3b07d0c997 Merge branch 'master' into set-retry-after 
Conflicts:
	tests/test_throttling.py
 2014-08-20 20:04:48 +04:00
Tom Christie
9372cc8c31 Deprecate .model attribute on views 2014-08-20 16:24:52 +01:00
Tom Christie
59b47eac14 Fix cache_throttle typo 2014-08-20 12:32:24 +01:00
Tom Christie
6ffc97c808 Merge pull request #1770 from tomchristie/2.4.0 
2.4.0 Release.
 2014-08-20 12:06:29 +01:00
Tom Christie
f7b3e1e62b Latest sponsor update 2014-08-20 11:09:04 +01:00
Tom Christie
874d2be83c Release notes 2014-08-20 00:19:03 +01:00
Tom Christie
0c65e028b6 Release notes 2014-08-19 23:25:12 +01:00