Xavier Ordoquy
4876bec9f5
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
rest_framework/fields.py
2014-07-26 00:06:56 +02:00
Tom Christie
ead0e60099
Docs for kickstarter announcement
2014-07-17 17:17:41 +01:00
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
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
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
1386767013
Version 2.3.14
2014-06-12 11:47:26 +01:00
Xavier Ordoquy
15c2c58b43
Updated the release-notes.
2014-05-01 08:43:49 +02:00
Xavier Ordoquy
7b4463f739
Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
...
Conflicts:
rest_framework/runtests/urls.py
tests/test_response.py
tox.ini
2014-05-01 08:01:38 +02:00
Xavier Ordoquy
2aca69a946
Merge remote-tracking branch 'reference/master' into feature/pytest
...
Conflicts:
tests/test_serializer.py
2014-04-30 22:24:01 +02:00
Xavier Ordoquy
56b4390316
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
rest_framework/serializers.py
rest_framework/tests/test_authentication.py
2014-04-30 22:21:26 +02:00
Xavier Ordoquy
f4a82dd5da
Updated the release notes.
2014-04-24 14:33:36 +02:00
Xavier Ordoquy
1797a74e82
Merge remote-tracking branch 'pelme/pytest' into feature/pytest
...
Conflicts:
.travis.yml
rest_framework/runtests/runtests.py
tests/test_filters.py
tests/test_pagination.py
tox.ini
2014-04-17 09:53:44 +02:00
Xavier Ordoquy
d08536ad9d
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/fields.md
docs/api-guide/routers.md
docs/topics/release-notes.md
rest_framework/authentication.py
rest_framework/serializers.py
rest_framework/templatetags/rest_framework.py
rest_framework/tests/test_authentication.py
rest_framework/tests/test_filters.py
rest_framework/tests/test_hyperlinkedserializers.py
rest_framework/tests/test_serializer.py
rest_framework/tests/test_testing.py
rest_framework/utils/encoders.py
tox.ini
2014-04-13 00:05:57 +02:00
Dmitry Mukhin
e45e52a255
replace page with page_size to avoide confusion
2014-04-07 20:39:45 +04:00
Tom Christie
c1148241ee
Version 2.3.13
2014-03-06 09:01:05 +00:00
Andreas Pelme
971578ca34
Support for running the test suite with py.test
...
* Get rid of runtests.py
* Moved test code from rest_framework/tests and rest_framework/runtests to tests
* Invoke py.test from setup.py
* Invoke py.test from Travis
* Invoke py.test from tox
* Changed setUpClass to be just plain setUp in test_permissions.py
* Updated contribution guideline to show how to invoke py.test
2014-03-02 12:40:30 +01:00
Kumar McMillan
e2857bdcff
Fix link to tox
2014-02-28 16:35:03 -06:00
Kumar McMillan
f5f4c1a837
strip trailing whitespace
...
my editor does this by default
2014-02-28 16:34:42 -06:00
Tom Christie
aaa5885232
Update credits
2014-02-13 17:40:00 +00:00
Tom Christie
c465ceaf5c
Merge pull request #1417 from amezhenin/issue_1386
...
Add myself into credits.md
2014-02-13 17:38:38 +00:00
Artem Mezhenin
45d89b5d11
credit, issue #1386 , PR #1397
2014-02-13 21:25:35 +04:00
amatellanes
0cb08ac707
Fixed Testing docs section
2014-02-12 23:17:05 +01:00
Tom Christie
71c03b9db9
Security update to OrderingFilter
2014-01-15 14:27:41 +00:00
Tom Christie
85d74fc86a
Added write_only and write_only_fields. Refs #1306
2014-01-14 11:25:44 +00:00
Tom Christie
2911cd64ad
Minor tweaks to 'lookup_value_regex' work
2014-01-13 15:37:52 +00:00
Tom Christie
a90796c0f0
Track changes that need noting in 2.4 announcement
2014-01-13 09:56:57 +00:00
Tom Christie
78494401c5
Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains
2014-01-08 15:22:41 +00:00
Kevin Brown
0672d6de6e
Fix bugfix note
...
This fixes a bugfix note that was added because of #1293 , which
pointed out that a change in a bugfix [1] broke backwards
compatibility. The bugfix did not work as expected because a
variable was quoted when it should not have been. This removes
the quotes around the variable, which brings back the expected
functionality.
2014-01-02 16:46:57 -05:00
Tom Christie
bed2f08c24
Updated release notes
2013-12-23 11:57:25 +00:00
Tom Christie
52686420f4
Merge branch 'bennbollay-patch-1' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/routers.md
rest_framework/compat.py
tox.ini
2013-12-23 09:48:59 +00:00
Tom Christie
31dd160256
Typo
2013-12-16 11:59:14 +00:00
Tom Christie
6b6b255684
Add note on pagination bugfix. Closes #1293 .
2013-12-14 20:42:58 +00:00
Tom Christie
f78b3187df
Added @philipforget for work on #1232 . Thanks :)
2013-12-13 22:01:19 +00:00
Tom Christie
54d3c6a725
Updated release notes
2013-12-13 21:59:47 +00:00
Tom Christie
87b99d1ac8
Update release notes
2013-12-13 20:17:26 +00:00
Tom Christie
9c41c007af
Merge branch 'master' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/routers.md
docs/topics/release-notes.md
rest_framework/compat.py
2013-12-13 16:32:34 +00:00
Tom Christie
c09ad1bedc
Remove incorrect apostrophe
2013-12-10 08:53:38 +00:00
Tom Christie
40164fcc62
Update release notes
2013-12-10 08:49:54 +00:00
Tom Christie
2c898bd901
Update release notes
2013-12-09 09:27:10 +00:00
Tom Christie
c1be503308
Add notes to contributing docs
2013-12-09 08:46:18 +00:00
Tom Christie
e6f6bb5c7e
Add notes to contributing docs
2013-12-09 08:42:09 +00:00
Tom Christie
23369650e3
Add notes to contributing docs
2013-12-09 08:14:21 +00:00
Tom Christie
e80b353085
Add notes to contributing docs
2013-12-09 08:10:51 +00:00
Tom Christie
910de38a9c
Version 2.3.10
2013-12-06 22:13:50 +00:00
Tom Christie
85d9eb0f7e
Update release-notes.md
2013-12-06 21:47:26 +00:00
Tom Christie
51359e4612
Added @chuckharmston for kickass bug squashing in #1272
2013-12-06 21:42:52 +00:00
Tom Christie
6446b44f01
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-12-04 14:59:28 +00:00
Tom Christie
de5b9e39dd
First pass on contribution guide
2013-12-04 14:59:09 +00:00
Tom Christie
38d78b21c0
Remove Content-Type header from empty responses. Fixes #1196
2013-12-03 16:55:11 +00:00
Tom Christie
9f1918e41e
Added @ian-foote, for work on #1250 . Thanks!
2013-12-03 16:06:57 +00:00
Tom Christie
b92c911cf6
Update release-notes.md
2013-12-03 16:05:19 +00:00
Tom Christie
fe4c7d4000
Update release-notes.md
2013-12-03 08:26:58 +00:00
Tom Christie
304b193efe
Update release-notes.md
2013-11-19 15:58:34 +00:00
Tom Christie
ca2bd616d9
Remove a couple of .html suffixes in docs
2013-11-19 11:01:27 +00:00
Tom Christie
1d1b2f765c
Version 2.3.9
2013-11-15 13:55:02 +00:00
Alex
72d72e4d3e
Add Alex Good to credits (Whoop!)
2013-11-13 14:32:37 +00:00
Tom Christie
5e0538fcda
Added @robhudson for work on #1211 . Thanks!
2013-11-02 09:15:35 +00:00
Tom Christie
2ddf7869e3
Added @yamila-moreno for work on #1199 . Thanks!
2013-10-24 15:29:40 +01:00
Tom Christie
4d894fd39e
Added @alexanderlukanin13 for fix #1198 . Thanks!
2013-10-24 13:50:05 +01:00
Tom Christie
f92d8bd972
Added @jbzdak, for the nice docs improvements in #1191 . Thanks!
2013-10-22 12:21:26 +01:00
Tom Christie
fa87fac61b
Added @ross for work on #1187 . Thanks!
2013-10-22 10:21:06 +01:00
Colin
daf927ef68
add @tamakisquare for work on #1111
2013-10-17 12:28:58 -07:00
Tom Christie
545ee013e3
Added @badale, for work on #1179 . Thanks!
2013-10-17 09:40:06 +01:00
Tom Christie
3833f1d55f
Added @hcliff for #1153 . Thanks!
2013-10-04 15:55:57 +01:00
Jeff
61dd9ce914
Update release-notes.md
...
Simple typo fix.
2013-10-01 15:47:47 -06:00
Krzysztof Jurewicz
49847584a8
Minor documentation fix.
2013-09-29 12:49:38 +02:00
Tom Christie
21cd638659
Merge master
2013-09-25 09:44:26 +01:00
Tom Christie
57a51f790b
Added @mkai, for work on #1126 . Thanks!
2013-09-24 09:21:55 +01:00
Tom Christie
e8c6cd5622
Update release notes.
2013-09-13 19:43:19 +01:00
Tom Christie
d75ecb3d69
Added @mrmachine. Thanks!
...
For work on #1109 .
2013-09-13 19:40:58 +01:00
Tai Lee
a9dbd46c94
Refs #1109 -- Update docs. Integrate changes from feedback.
2013-09-14 00:54:44 +10:00
Tom Christie
895beb89c6
Note on '.model' as default only, with 'serializer_class', and 'queryset' attributes prefered. Closes #1100
2013-09-12 21:41:21 +01:00
Tom Christie
195790e60b
Version 2.3.8
2013-09-11 09:09:30 +01:00
Tom Christie
e021472a16
Added @bwreilly for awesome work on #1093 . Thanks!!!
2013-09-10 21:07:20 +01:00
Tom Christie
101da45810
Updated release notes
2013-09-10 21:06:42 +01:00
Tom Christie
f5c34926d6
Update release-notes.md
2013-09-09 20:41:54 +01:00
Tom Christie
b47f1b0257
Added @edmundwong for work on #1076 . Thanks!
2013-09-05 20:25:45 +01:00
Tom Christie
f8101114d1
Update release notes
2013-08-30 09:31:35 +01:00
Tom Christie
9a5b2eefa9
Merge master
2013-08-30 09:28:33 +01:00
Tom Christie
ac0fb01be3
Update release notes.
2013-08-29 19:31:36 +01:00
Tom Christie
4b46de7dce
Added @diox for fix #1074 . Thanks!
2013-08-29 19:31:36 +01:00
Tom Christie
6f8acb5a76
Added @niwibe
...
For docs addition #1070 - Thanks!
2013-08-29 09:31:12 +01:00
Tom Christie
711fb9761c
Update release notes.
2013-08-28 13:35:27 +01:00
Tom Christie
d7224afe54
Added @alexander-akhmetov.
...
For work on MAX_PAGINATE_BY, #1063 . Thanks! :)
2013-08-28 12:57:29 +01:00
Tom Christie
c3e273a90e
Added @kristianoellegaard.
...
For docs addition #1059 . Thanks!
2013-08-27 09:16:20 +01:00
Tom Christie
2340035789
Added @ericbuehl
...
For pull request #1058 . Thank you! :)
2013-08-25 20:48:10 +01:00
Tom Christie
f54fc3a76b
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-08-23 14:06:39 +01:00
Tom Christie
7bbe0f868f
Added @krzysiekj
...
For work on #1034 . Thanks!
2013-08-23 13:37:25 +01:00
Tom Christie
f2b190e374
Update release notes
2013-08-23 12:06:23 +01:00
Tom Christie
19a774f972
force_authenticate(None) also clears session info.
...
Closes #1055 .
2013-08-23 11:21:52 +01:00
Stephan Groß
b8561f4123
Add @ramiro for #1056 thanks!
2013-08-22 17:52:22 +02:00
Tom Christie
16ffdedd14
Merge master
2013-08-21 21:31:59 +01:00
Tom Christie
44ceef8415
Updating 2.4.0 release notes
2013-08-21 21:30:25 +01:00
Tom Christie
4338e1e43f
Added @filipeximenes
...
For work on #1050 . Thanks!
2013-08-21 20:00:35 +01:00
Tom Christie
f84d4951bf
Update release notes
2013-08-19 21:46:34 +01:00
Tom Christie
34d65119fc
Update release notes.
2013-08-19 08:54:48 +01:00
Tom Christie
3a99b0af50
Added @chrispaolini.
...
For customizable view names/descriptions in #1043 . Thanks! :)
2013-08-19 08:47:52 +01:00
Tom Christie
f6f69dc71d
Version 2.3.7
2013-08-16 14:03:20 +01:00
Tom Christie
d5b56310b0
Update release notes
2013-08-16 13:23:27 +01:00