Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DjangoGirls/tutorial
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: bauerv/tutorial
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 7 files changed
  • 2 contributors

Commits on Jan 27, 2017

  1. merge from djangogirls (#2)

    * inclusos for incluso
    
    * Fixed, code seperated line from 123. Line
    
    * A more positive feel for the "Introduction" 
    
    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged"). 
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    
    * Added clarification about directory content
    
    On several occasions, we had confusion about the contents of the directory after running the django-admin.py script. The directory tree suggests to show all the contents, but in fact, when following the installation guideline, venv will also sit in the djangogirls directory. This is missing in the pic, so participants sometimes think it is an error and might try to delete it. I suggest a note to fix this.
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    7f93774 View commit details
    Browse the repository at this point in the history
  2. Patch 3 (#3)

    * inclusos for incluso
    
    * Fixed, code seperated line from 123. Line
    
    * A more positive feel for the "Introduction" 
    
    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged"). 
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    
    * Added clarification about directory content
    
    On several occasions, we had confusion about the contents of the directory after running the django-admin.py script. The directory tree suggests to show all the contents, but in fact, when following the installation guideline, venv will also sit in the djangogirls directory. This is missing in the pic, so participants sometimes think it is an error and might try to delete it. I suggest a note to fix this.
    
    * Welcome to tutorial section
    
    First draft, comments welcome!
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    6029d56 View commit details
    Browse the repository at this point in the history
  3. Patch 3 (#4)

    * inclusos for incluso
    
    * Fixed, code seperated line from 123. Line
    
    * A more positive feel for the "Introduction" 
    
    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged"). 
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    
    * Added clarification about directory content
    
    On several occasions, we had confusion about the contents of the directory after running the django-admin.py script. The directory tree suggests to show all the contents, but in fact, when following the installation guideline, venv will also sit in the djangogirls directory. This is missing in the pic, so participants sometimes think it is an error and might try to delete it. I suggest a note to fix this.
    
    * Welcome to tutorial section
    
    First draft, comments welcome!
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    7381a57 View commit details
    Browse the repository at this point in the history
  4. Patch 2 (#5)

    * inclusos for incluso
    
    * Fixed, code seperated line from 123. Line
    
    * A more positive feel for the "Introduction" 
    
    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged"). 
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    
    * Added clarification about directory content
    
    On several occasions, we had confusion about the contents of the directory after running the django-admin.py script. The directory tree suggests to show all the contents, but in fact, when following the installation guideline, venv will also sit in the djangogirls directory. This is missing in the pic, so participants sometimes think it is an error and might try to delete it. I suggest a note to fix this.
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    20a6a12 View commit details
    Browse the repository at this point in the history
  5. A more positive feel for the "Introduction" (#6)

    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged"). 
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    221c2ee View commit details
    Browse the repository at this point in the history
  6. url consistency (#7)

    * inclusos for incluso
    
    * Fixed, code seperated line from 123. Line
    
    * A more positive feel for the "Introduction" 
    
    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged"). 
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    
    * Added clarification about directory content
    
    On several occasions, we had confusion about the contents of the directory after running the django-admin.py script. The directory tree suggests to show all the contents, but in fact, when following the installation guideline, venv will also sit in the djangogirls directory. This is missing in the pic, so participants sometimes think it is an error and might try to delete it. I suggest a note to fix this.
    
    * Consistency between text and code example
    
    `blog.views.post_detail` is not in the source code example so the explanation in the following paragraph was not consistent with it. From what I understand, it is the URL created by Django, so I added this to the text.
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    e4eaa46 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'master' of https://github.com/DjangoGirls/tutorial

    synchronizing to catch up with original project
    bauerv committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    3f0009d View commit details
    Browse the repository at this point in the history
  8. Merge pull request #8 from bauerv/patch-1

    Consistency between text and code example
    bauerv authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    fdf52b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2017

  1. Reminder how to open files in code editor

    Participants got confused and expected to open the editor and files from the command line. I suggest adding a note reminding them to treat the file like any other :)
    bauerv authored Jan 28, 2017
    Configuration menu
    Copy the full SHA
    1dd6126 View commit details
    Browse the repository at this point in the history
  2. Reminder to save

    Coming from the command line, participants keep forgetting to save their edits and keep getting lots of errors. Just a small reminder.
    bauerv authored Jan 28, 2017
    Configuration menu
    Copy the full SHA
    c69c6f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2017

  1. Update README.md

    bauerv authored Feb 1, 2017
    Configuration menu
    Copy the full SHA
    ed0b181 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    bauerv authored Feb 1, 2017
    Configuration menu
    Copy the full SHA
    8c4d7ec View commit details
    Browse the repository at this point in the history
  3. Merge pull request #9 from bauerv/bauerv-patch-1

    Update README.md
    bauerv authored Feb 1, 2017
    Configuration menu
    Copy the full SHA
    10e4d06 View commit details
    Browse the repository at this point in the history
  4. Update README.md

    bauerv authored Feb 1, 2017
    Configuration menu
    Copy the full SHA
    8369dce View commit details
    Browse the repository at this point in the history
  5. Merge pull request #10 from bauerv/bauerv-patch-2

    Update README.md
    bauerv authored Feb 1, 2017
    Configuration menu
    Copy the full SHA
    17bf157 View commit details
    Browse the repository at this point in the history
  6. A more positive feel for the "Introduction"

    The version "feel somehow left behind" has a strong negative feeling to it. To me (as a coach) this feels problematic/counterproductive when starting off the day with super motivated participants (essentially, I'm "reminding" them about the "fact" that they might be "left behind" instead of, e.g., "courageous" or "engaged").
    
    I'm proposing a small correction to soften this feel. However, ideally, I would prefer the tutorial to start off with a friendly and warm welcome (and potentially congratulations that the participant worked up the courage to get herself into this in the first place). Maybe add a dedicated "Welcome" section?
    bauerv authored and bauerv committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    611bc0f View commit details
    Browse the repository at this point in the history
  7. Added clarification about directory content

    On several occasions, we had confusion about the contents of the directory after running the django-admin.py script. The directory tree suggests to show all the contents, but in fact, when following the installation guideline, venv will also sit in the djangogirls directory. This is missing in the pic, so participants sometimes think it is an error and might try to delete it. I suggest a note to fix this.
    bauerv authored and bauerv committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    bb764a5 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. Merge branch 'master' of https://github.com/DjangoGirls/tutorial

    Conflicts:
    	en/README.md
    	en/django_models/README.md
    bauerv committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    c7cf391 View commit details
    Browse the repository at this point in the history
Loading