Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull from upstream #1

Merged
merged 7 commits into from Nov 1, 2018
Merged

Pull from upstream #1

merged 7 commits into from Nov 1, 2018

Commits on Oct 24, 2018

  1. Update VNC instructions

    @robrap
    robrap committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    cef4b83 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Stay within limits of free AppVeyor plan

    @jmbowman
    jmbowman committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    383e9f9 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Improve: fix typo in makefile

    @asamolion @nedbat
    asamolion authored and nedbat committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    b242cec View commit details
    Browse the repository at this point in the history

  2. Make sure OPENEDX_GIT_BRANCH is honoured during clone

    @silviot @macdiesel
    silviot authored and macdiesel committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    59de6c9 View commit details
    Browse the repository at this point in the history

  3. Only fetch and checkout if needed. Pull if the checked out branch is … 

    …already the desired one
    @silviot @macdiesel
    silviot authored and macdiesel committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    0b4ad63 View commit details
    Browse the repository at this point in the history

  4. Fix make dev.checkout

    @silviot @macdiesel
    silviot authored and macdiesel committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    06fbdd5 View commit details
    Browse the repository at this point in the history

  5. Factor out common logic

    @silviot @macdiesel
    silviot authored and macdiesel committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    da48689 View commit details
    Browse the repository at this point in the history