Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Merge downstream #4441

Merged
merged 11 commits into from
Jul 20, 2020
Merged

Merge downstream #4441

merged 11 commits into from
Jul 20, 2020

Commits on Jul 9, 2020

  1. Merge src/frontend from downstream

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    b63ddb0 View commit details
    Browse the repository at this point in the history

  2. Merge src/jetstream from jetstream

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    87b4feb View commit details
    Browse the repository at this point in the history

  3. Remove examples/custom-src

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    d71d8f0 View commit details
    Browse the repository at this point in the history

  4. Merge deploy from downstream 

    Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one
    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    4cd8719 View commit details
    Browse the repository at this point in the history

  5. Merge build from downstream

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    bc68bef View commit details
    Browse the repository at this point in the history

  6. Add missing merge items from deploy

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    bbb849e View commit details
    Browse the repository at this point in the history

  7. Updates to package-lock

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    6e2aae3 View commit details
    Browse the repository at this point in the history

  8. Remove fdescribe

    @richard-cox
    richard-cox committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    4f80ae5 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2020

  1. Fix e2e core tests

    @richard-cox
    richard-cox committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    968f78e View commit details
    Browse the repository at this point in the history

  2. Remove favicon from packages/core/src

    @richard-cox
    richard-cox committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    5f3dfa8 View commit details
    Browse the repository at this point in the history

  3. Changes following review

    @richard-cox
    richard-cox committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    9eaede2 View commit details
    Browse the repository at this point in the history