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
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
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
DanSears
abb240648c
clarified which urls.py to edit
2014-02-28 08:40:45 -08:00
Tom Christie
9a8082878a
Use a local virtualenv, not in the users homedir.
2014-01-14 17:13:48 +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
d8a95b4b6d
Back out permissions example change in favor of easier to follow example
2013-12-23 09:12:34 +00:00
amatellanes
2846ddb5d2
Simplified some examples in tutorial
2013-12-23 09:06:03 +01:00
amatellanes
74f1cf6355
Revert "Simplified some examples in tutorial"
...
This reverts commit d6806340e5
2013-12-23 08:56:34 +01:00
amatellanes
d6806340e5
Simplified some examples in tutorial
2013-12-23 08:50:46 +01:00
Tom Christie
02ae1682b5
Add note on compat import in tutorial
2013-12-17 09:45:28 +00:00
Xavier Ordoquy
8026480454
Use the BytesIO for buffering bytes and import the one from the compat module.
2013-12-17 10:30:23 +01: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
ca244ad614
Expanded notes in quickstart. Closes #1127 . Closes #1128 .
2013-12-13 15:30:59 +00:00
Tom Christie
075b8c1037
Add User import. Refs #599
2013-11-18 09:29:09 +00:00
Tom Christie
c3aeb16557
Update 3-class-based-views.md
2013-10-18 09:32:04 +01:00
Tom Christie
016deaf9de
Merge pull request #1177 from rprince/patch-2
...
Mention name of file to edit
2013-10-18 01:30:17 -07:00
Tom Christie
44a0f1cfbc
Merge pull request #1178 from rprince/patch-3
...
Using the filenames where relevant
2013-10-18 01:16:51 -07:00
Tom Christie
78c8e6de40
Update 2-requests-and-responses.md
2013-10-18 09:10:54 +01:00
Rikki
bf60848952
Using the filenames where relevant
...
Sometimes it's hard to tell which file the code is intended to go in. Now it spells it out.
2013-10-16 03:21:43 +01:00
Rikki
cb123e896e
Mention name of file to edit
...
To reduce unnecessary cognitive load of the learner, name the file they are putting this code in.
2013-10-16 03:08:43 +01:00
Rikki
e83bc00323
Added name of file to edit
...
So reader doesn't have to remember, or check through all the files to find where this code fragment was, mention the file name when it is relevant.
2013-10-16 03:03:51 +01:00
Tom Christie
97fbc5caec
Merge pull request #1157 from dpetzel/tutorial_authentication
...
Be sure to import UserSerializer
2013-10-11 00:36:55 -07:00
dpetzel
864497eebb
Be sure to import UserSerializer
2013-10-05 23:16:58 -04:00
dpetzel
48a38386af
**very minor** typo fix
2013-10-05 19:29:25 -04:00
Tom Christie
21cd638659
Merge master
2013-09-25 09:44:26 +01:00
John Mee
de6e7accef
Mindnumbingly trivial single-char typo.
2013-09-23 14:03:09 +10:00
Braulio Soncco
3d8fad0444
Fixing simple typo
2013-09-18 00:33:05 -05:00
Tom Christie
8b245fed14
Add windows virtualenv activate instruction
...
Closes #1075 .
2013-09-02 09:17:51 +01:00
tom-leys
85ab879a85
Updated tutorial part 6: 2 examples were missing includes
2013-08-31 19:40:53 +12:00
Tom Christie
c607414f16
Merge
2013-08-19 20:36:18 +01:00
martync
770d496307
Small typo
2013-08-13 09:19:40 +02:00
Veronica Lynn
4d8d2340be
Fixed typos in a bunch of docs
2013-08-07 14:00:06 -04:00
Rodrigo Martell
3a898a11f7
Fix Tutorial5 serializers.py typo
...
[Issue #N/A]
A slight typo at Tutorial5 causing an Exception "name 'models' is
not defined". A subtle one that can confuse Python/Django noobs
like me.
2013-07-27 10:09:56 +10:00
Alex Burgel
eaae8fb2d9
Combined link_* and action_* decorators into detail_route and list_route, marked the originals as deprecated.
2013-07-15 18:35:13 -04:00
bigsassy
c875a27edf
Update 1-serialization.md
...
Fixed typo in documentation (Testarea to Textarea)
2013-06-16 18:32:33 -03:00
Toby Champion
250dfef158
Changes 'python' to 'Python' when used in prose.
2013-06-12 14:51:17 -07:00
Tom Christie
777ecb5141
Add renderer_classes kwarg when binding snippet_highlight explicitly. Closes #923
2013-06-10 09:05:44 +01:00
Areski Belaid
ffdf633aa5
Fix on documentation - wrong reference at previous created view UserList / UserDetail
2013-06-05 14:19:36 +02:00
Tom Christie
233320691e
Rephrase serializer -> form notes in tutorial
2013-05-30 11:47:41 +01:00
Tom Christie
441cdf8065
Note widget attribute on serializer field. Closes #836 .
2013-05-30 11:34:09 +01:00
Tom Christie
8d4bcb4b4c
Fix quickstart urls module name. Closes #902
2013-05-30 11:12:19 +01:00
Stephan Groß
7a570e16e9
Fix md formatting and typos
2013-05-28 17:13:12 +02:00
Pascal Borreli
8f35ac4f93
Fixed typos
2013-05-28 15:09:23 +01:00
Andrew Tarzwell
62c7326b77
Update Typo
2013-05-20 17:43:37 -03:00
