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
299a8347e8
Merge pull request #1692 from davbo/patch-1
...
Update fields.md
2014-07-22 15:59:04 +02:00
Tom Christie
81d15aa9be
Add link to drf-extra-fields. Closes #1698
2014-07-20 15:45:45 +01:00
Tom Christie
4324f50437
Phrasing tweak
2014-07-18 11:54:51 +01:00
Tom Christie
ab34ddcf2f
Typo
2014-07-18 11:53:23 +01:00
Tom Christie
550243fd26
Beef up the kickstarter announcement
2014-07-18 11:51:48 +01:00
Tom Christie
ead0e60099
Docs for kickstarter announcement
2014-07-17 17:17:41 +01:00
Tom Christie
6bf0f81b0b
Kickstarter note on front page
2014-07-17 13:41:19 +01:00
Dave King
680fabe9dd
Update fields.md
...
obj.__class__ will return the actual Class object, we want to serialise a string (accessed with obj.__class__.__name__)
2014-07-17 11:46:59 +01:00
Tom Christie
dd2e950cde
Fusion ads
2014-07-15 15:02:09 +01:00
Tom Christie
b519018125
Docs on object level permissions and filters. Closes #1683
2014-07-07 09:51:23 +01:00
Tom Christie
91eabd54bb
Docs tweak
2014-07-01 14:34:23 +01:00
Chibisov Gennady
c1426d1078
Fixes #1651 . Add link to drf-extensions nested routers to docs
2014-06-26 23:29:00 +04: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
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
Greg Barker
be84f71bc9
Fix #1614 - Corrected reference to serializers.CharField
2014-06-10 15:20:45 -07:00
Rodolfo Carvalho
31f63e1e55
Fix typo in docs
2014-06-02 11:06:03 +02:00
Tom Christie
a7ff51118f
Note on configuring TokenAuthentication
2014-05-29 14:33:16 +01:00
khamaileon
eab5933070
Add the allow_add_remove parameter to the get_serializer method
2014-05-26 18:43:50 +02: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
Giorgos Logiotatidis
768f537dcb
Typo fix.
2014-05-15 15:42:22 +03:00
Sylvain Bellemare
e033a0b9a0
Replaced singular "is" by plural "are"
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
beb7253a96
Removed unnecessary "that"
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
9dc5e15e5a
Added missing "the" word
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
9e3ba939e1
Removed superfluous "./"s
2014-05-05 20:28:00 +02:00
Sylvain Bellemare
05fc974dc9
Added missing "the" word
2014-05-05 14:44:54 +02:00
Sylvain Bellemare
cdc7d19034
Added missing "to" word
2014-05-05 14:41:10 +02: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
d8fb81ceb1
Merge pull request #1391 from kaygorodov/master
...
Turning off pagination
2014-04-30 20:14:16 +02:00
Laurent Bristiel
d8cb85ef8f
typo
2014-04-28 22:00:36 +02:00
dpetzel
5e8f05a8de
very minor typo in code example
2014-04-28 13:51:50 -04: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
Miro Hrončok
f68596a732
Document new UnicodeYAMLRenderer
2014-04-10 01:58:06 +02:00
Craig
3234a5dd6b
Fix python syntax in filtering docs
2014-04-08 22:56:07 -04:00
Dmitry Mukhin
e45e52a255
replace page with page_size to avoide confusion
2014-04-07 20:39:45 +04:00
Tom Christie
abe14c06f7
Minor docs tweak
2014-03-17 08:36:13 +00:00
Tom Christie
dddbff5931
Tweak DRF compound fields docs
2014-03-17 08:33:18 +00:00
Steven Cummings
c779dce3e4
Serializer fields section for 3rd-party packages
...
* Add new section to serializer fields page where we can list and link 3rd-party packages that provide more field types
* Add an entry for drf-compound-fields
2014-03-16 18:55:21 -05:00
Peter Inglesby
2353878951
Add SEARCH_PARAM and ORDERING_PARAM to settings
...
Fixes #1434
2014-03-06 21:39:44 +00: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
c2cd610b15
Adds HawkREST to 3rd party auth docs
2014-02-28 16:52:47 -06:00
Kumar McMillan
a4470c4276
Fix trailing whitespace
...
Sorry, my editor does this automatically
2014-02-28 16:51:32 -06:00