Tom Christie
|
d4b8e356b9
|
Merge branch '3.0-docs'
|
2014-11-28 09:57:02 +00:00 |
|
Will Stott
|
d0e245baba
|
grammar
|
2014-11-26 15:51:28 +00:00 |
|
Will Stott
|
34bd2b7828
|
a few typos
|
2014-11-26 15:48:08 +00:00 |
|
Tom Christie
|
f13c0ebe69
|
Merge master
|
2014-11-25 16:27:00 +00:00 |
|
José Padilla
|
200e0b17da
|
Clean up extra white space
|
2014-11-25 12:44:11 +00:00 |
|
Tom Christie
|
2e726e22a3
|
request.DATA, request.FILES -> request.data
|
2014-11-25 11:42:43 +00:00 |
|
Tom Christie
|
3371131a61
|
Merge pull request #2116 from LuRsT/patch-5
Fixed database update instructions
|
2014-11-24 13:21:15 +00:00 |
|
Gil Gonçalves
|
918b9cc6a6
|
Added missing import in tutorial snippet
|
2014-11-24 08:54:07 +00:00 |
|
Gil Gonçalves
|
790a651893
|
Fixed database update instructions
|
2014-11-24 08:51:08 +00:00 |
|
Gil Gonçalves
|
04d2635b24
|
Removed unused import from code snippet in tutorial
|
2014-11-20 11:33:42 +00:00 |
|
Raony Guimarães
|
928cbc640e
|
small type
|
2014-11-19 13:53:36 -02:00 |
|
Tom Christie
|
5d247a65c8
|
First pass on nested serializers in HTML
|
2014-10-09 15:11:19 +01:00 |
|
Tom Christie
|
a58cfe167d
|
Update tutorial for 3.0
|
2014-10-09 09:38:03 +01:00 |
|
Collin Anderson
|
da385c9c1f
|
remove patterns and strings from urls #1898
|
2014-09-23 17:10:02 -04:00 |
|
Tom Christie
|
9372cc8c31
|
Deprecate .model attribute on views
|
2014-08-20 16:24:52 +01:00 |
|
Tom Christie
|
e385a7b8eb
|
Merge master
|
2014-08-19 10:11:10 +01:00 |
|
Tom Christie
|
61a1eaa485
|
tabs -> spaces
|
2014-08-18 11:55:22 +01:00 |
|
Tom Christie
|
92d51c813f
|
Merge pull request #1688 from ekonstantinidis/quick-start-order
Updated quick start project set up order
|
2014-08-18 11:54:14 +01:00 |
|
sshquack
|
867e441ec0
|
Strip trailing spaces in tutorial
|
2014-08-15 20:45:28 -06:00 |
|
sshquack
|
14867705e9
|
Specify file names using standard format
+ Explicitly specify module names in the standard format similar to all
the other tutorials
+ Remove the extra quote around module name
|
2014-08-15 20:41:21 -06:00 |
|
nimiq
|
62d0d4e5d2
|
Fix style for some text
|
2014-08-06 12:45:58 +02:00 |
|
Emmanouil
|
18eab53e89
|
Updated quick start project set up order
|
2014-07-09 15:53:31 +01: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 |
|
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 |
|