encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-04 23:44:07 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,592 Commits 18 Branches 132 Tags 105 MiB
f5e5ed0077
Commit Graph

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlton Gibson
d98245ac22 Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559 
Conflicts:
	docs/topics/release-notes.md
 2014-06-24 10:30:08 +02:00
Carlton Gibson
3f727ce738 Added (first pass) notes to docs & release notes. Backed out SOUTH_MIGRATION_MODULES setting from rest_framework.settings 2014-06-24 09:02:44 +02:00
Carlton Gibson
f34011f801 Allow use of native migrations in 1.7 2014-06-23 14:52:18 +02:00
Xavier Ordoquy
2489e38a06 Merge remote-tracking branch 'origin/master' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/viewsets.md
	rest_framework/serializers.py
	rest_framework/throttling.py
	tests/test_generics.py
	tests/test_serializers.py
	tox.ini
 2014-06-23 14:02:45 +02:00
Tom Christie
511e874185 Merge pull request #1645 from tankorsmash/patch-1 
tiny typo in the docstring
 2014-06-17 13:37:03 +01:00
TankorSmash
544183f64f typo in the docs 2014-06-16 19:13:02 -04:00
Walt Javins
b4c7717cb8 Refactor login template to extend base. 
While experimenting with extending DRF, I found that the login page
1) had no title, and 2) duplicated <head> info from base.html.

This change adds a new {% block body %} to the base.html template
which allows override of the entire html <body>. login_base.html
has its duplicated head info stripped, and now extends base.html
to share common html <head> templating.

As part of this change, pretify.css is unnecessarily added to
login_base.html.  If this is deemed a problem, it will be easy to
block that css out, and have login_base.html override the block.

Ideally, I would have liked to create a new api_base.html that extends
base.html, move the api specific logic into that template, and leave
base.html content agnostic, to truely be a unifying base for all DRF
pages.  But this change would break current apps that override
api.html and expect base.html to be the immediate super template. :/

This change is benificial because it:
 - removes duplication of header declarations (mostly css includes)
 - adds a html title to the login page
 - standardizes html header info across all DRF pages

Docs are updated to reflect the new structure.
 2014-06-13 22:26:00 -07:00
Tom Christie
e11f41ebc4 Merge pull request #1640 from tomchristie/escape-login-logout-paths 
Version 2.3.14
 2014-06-12 12:09:29 +01:00
Tom Christie
82659873c9 Fix accidental docs change 2014-06-12 11:48:58 +01:00
Tom Christie
1386767013 Version 2.3.14 2014-06-12 11:47:26 +01:00
Tom Christie
3dcc6585d2 Merge pull request #1632 from fletchowns/master 
Fix #1614 - Corrected reference to serializers.CharField
 2014-06-11 09:17:12 +01:00
Greg Barker
be84f71bc9 Fix #1614 - Corrected reference to serializers.CharField 2014-06-10 15:20:45 -07:00
Xavier Ordoquy
e8ec81f5e9 Fixed #1624 (thanks @abraithwaite) 2014-06-08 09:03:21 +02:00
Xavier Ordoquy
a3e75e4c6c Merge pull request #1619 from khamaileon/master 
Replace ChoiceField type_label
 2014-06-05 13:08:28 +02:00
khamaileon
08c4594145 Replace ChoiceField type_label 2014-06-05 12:49:02 +02:00
Xavier Ordoquy
0c91d8ed31 Merge pull request #1612 from rhcarvalho/patch-3 
Fix typo in docs
 2014-06-02 11:13:34 +02:00
Rodolfo Carvalho
31f63e1e55 Fix typo in docs 2014-06-02 11:06:03 +02:00
Tom Christie
12394c9cac Merge pull request #1608 from dbrgn/test_client_contenttype 
Always use specified content type in APIRequestFactory
 2014-05-30 19:31:06 +01:00
Danilo Bargen
6cb6bfae1b Always use specified content type in APIRequestFactory 
If `content_type` is specified in the `APIRequestFactory`, always
include it in the request, even if data is empty.
 2014-05-30 17:53:26 +02:00
Tom Christie
a7ff51118f Note on configuring TokenAuthentication 2014-05-29 14:33:16 +01:00
Xavier Ordoquy
add1260be4 Merge pull request #1603 from khamaileon/master 
Add the allow_add_remove parameter to the get_serializer method
 2014-05-26 19:58:55 +02:00
khamaileon
eab5933070 Add the allow_add_remove parameter to the get_serializer method 2014-05-26 18:43:50 +02:00
Tom Christie
708b6a6c06 Merge pull request #1596 from pipermerriam/piper/suport_unicode_model_references 
`_resolve_model` should work with unicode strings
 2014-05-23 09:01:13 +01:00
Piper Merriam
807f7a6bb9 Fix _resolve_model to work with unicode strings 2014-05-22 15:18:51 -06:00
Tom Christie
01e2a34210 Merge pull request #1594 from jcsp/wip-methodfield 
fields: allow help_text on SerializerMethodField
 2014-05-22 17:26:37 +01:00
John Spray
04c820b8e5 fields: allow help_text on SerializerMethodField 
...by passing through any extra *args and **kwargs
to the parent constructor.

Previously one couldn't assign help_text to a
SerializerMethodField during construction.
 2014-05-22 15:24:35 +01:00
Tom Christie
218b94e606 Merge pull request #1536 from Ian-Foote/choicefield_blank_display_value 
Allow customising ChoiceField blank display value
 2014-05-20 16:03:51 +01:00
Ian Foote
1e7b5fd2c0 Document ChoiceField blank_display_value parameter 2014-05-20 14:55:00 +01:00
Xavier Ordoquy
d46d153a99 Merge pull request #1589 from the5fire/fix-pep8 
fix pep8
 2014-05-19 07:38:06 +02:00
allenhu
a1a3ad7639 fix pep8 2014-05-19 09:53:05 +08:00
Xavier Ordoquy
af1ee3e631 Fixed a small change in the 1.7 beta url. 2014-05-18 09:38:46 +02:00
Xavier Ordoquy
a2e1024f8b Updated Django versions. 2014-05-18 09:27:23 +02:00
Xavier Ordoquy
5c12b07681 Added missing import. 2014-05-16 19:40:02 +02:00
Xavier Ordoquy
a704d5a206 Fixed tests for python 3.4 2014-05-16 01:20:40 +02:00
Xavier Ordoquy
b370fb40b6 Typo in the Python version. 2014-05-16 01:06:34 +02:00
Xavier Ordoquy
e5556079fc Updated tox with Python 2.4 2014-05-16 00:50:16 +02:00
Xavier Ordoquy
160fbbee0c Merge remote-tracking branch 'frewsxcv/patch-1' into feature/python34 2014-05-16 00:33:49 +02:00
Xavier Ordoquy
eb15c25ba1 Merge pull request #1585 from glogiotatidis/master 
Typo fix.
 2014-05-15 23:58:52 +02:00
Giorgos Logiotatidis
768f537dcb Typo fix. 2014-05-15 15:42:22 +03:00
Corey Farwell
8ecb778cd2 Enable testing on Python 3.4 2014-05-11 20:29:01 -07:00
Carlton Gibson
d69d975015 Merge pull request #1564 from alumni/master 
Fixes #1535 (HTML widget missing `id` attribute)
 2014-05-09 10:36:06 +02:00
Carlton Gibson
2768101441 Merge pull request #1576 from carltongibson/fix-#1575 
Updated failing test from #1575
 2014-05-08 11:41:33 +02:00
Carlton Gibson
0ff474d7c4 Updated failing test from #1575 2014-05-08 11:20:03 +02:00
Carlton Gibson
591d5240da Merge pull request #1575 from ewdicus/iso8601 
Add colon to time zone offset in readable_datetime_formats
 2014-05-08 09:34:06 +02:00
Elliott
11115fde9c Add colon to time zone offset in readable_datetime_formats 2014-05-07 11:37:20 -07:00
Serhiy Voyt
4e6a21344f Fixed test. 2014-05-07 18:42:02 +03:00
Serhiy Voyt
27be31bd8a In case of None value returns empty string instead of NoneType. 2014-05-07 18:37:08 +03:00
Serhiy Voyt
1ce1f387b0 Charfied from_native method returns default instead of None. Updated tests. 2014-05-06 21:57:25 +03:00
Serhiy Voyt
98cc821099 Extended test with case of saveing model with blank not null field. 2014-05-06 20:34:30 +03:00
Tom Christie
4ce42fb72b Merge pull request #1569 from sbellem/help-docs 
Help docs
 2014-05-06 15:33:40 +01:00