Skip to content

merge form jeff#1

Merged
panjunyong merged 176 commits intopanjunyong:masterfrom
jeffkit:master
Dec 15, 2015
Merged

merge form jeff#1
panjunyong merged 176 commits intopanjunyong:masterfrom
jeffkit:master

Conversation

@panjunyong
Copy link
Copy Markdown
Owner

No description provided.

patjouk and others added 30 commits November 11, 2015 16:06
python_introduction link was intro_to_command_line
Include note for Win 8 and 10 pip install crash
Specifying to use the right Django Admin to add data for the Pythonanywhere site.  It took me a little while to figure this one out so thought it might be helpful for other people.
Chinese simplified - translation of tutorial
patrick91 and others added 28 commits December 12, 2015 10:37
Fix quotes on italian translation
The text "Scegli la versione "HTTPS", copialo, e incollalo nel terminale a breve" does not make much sense in italian.
It can be removed since on the next lines the concept is explained well enough.
The command block for Spanish is missing new lines and the collectstatic.
Removed line that generates misunderstanding
Fix command blocks for Spanish version.
We have specified the version of Django to avoid the default version (1.9)
add version to django and whitenoise
panjunyong pushed a commit that referenced this pull request Dec 15, 2015
@panjunyong panjunyong merged commit cedce37 into panjunyong:master Dec 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.