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

chore: backmerge develop into unified-desktop-gui #18566

Merged
merged 28 commits into from
Oct 20, 2021
Merged

chore: backmerge develop into unified-desktop-gui #18566

merged 28 commits into from
Oct 20, 2021

Commits on Oct 11, 2021

  1. Fix cypress_spec to run permissions test locally

    @BlueWinds
    BlueWinds committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    0d5ff9b View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. Re-add root check to permissions test

    @BlueWinds
    BlueWinds committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    3e4012a View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. feat(driver): Add overwrite option to Cypress.Screenshot.defaults (… 

    …#18457)
    @davidmunechika
    davidmunechika committed Oct 13, 2021
    4 Configuration menu
    Copy the full SHA
    bc21574 View commit details
    Browse the repository at this point in the history

  2. fix: revive type checker (#18172) 

    Co-authored-by: Zach Bloomquist <github@chary.us>
    @sainthkh @flotwig
    sainthkh and flotwig committed Oct 13, 2021
    4 Configuration menu
    Copy the full SHA
    af472b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. fix: warn when the projectRoot is not writeable (#18495) 

    closes #18485
    @elevatebart
    elevatebart committed Oct 14, 2021
    4 Configuration menu
    Copy the full SHA
    83a1f09 View commit details
    Browse the repository at this point in the history

  2. chore: Update Chrome (beta) to 95.0.4638.49 (#18489) 

    Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
    @github-actions
    github-actions[bot] and cypress-bot[bot] committed Oct 14, 2021
    4 Configuration menu
    Copy the full SHA
    8e3e99d View commit details
    Browse the repository at this point in the history

  3. Update packages/server/lib/scaffold.js 

    Co-authored-by: Zach Bloomquist <github@chary.us>
    @flotwig
    Blue F and flotwig committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    d517793 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18445 from cypress-io/local-server-integration-te… 

    …st-fix

fix: server cypress_spec permissions test now passes
    Blue F committed Oct 14, 2021
    4 Configuration menu
    Copy the full SHA
    f4fee90 View commit details
    Browse the repository at this point in the history

  5. feat: normalized signatures webpack & vite servers (#18379)

    @elevatebart
    elevatebart committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    8f5308f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into develop

    @elevatebart
    elevatebart committed Oct 14, 2021
    4 Configuration menu
    Copy the full SHA
    a8143a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2021

  1. chore(.gitignore): remove duplicate entry

    @emilyrohrbough
    emilyrohrbough committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    43a8fb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. feat: updated README.md ,added hyperlink to cypress banner (#18519)

    @itsAftabAlam
    itsAftabAlam committed Oct 18, 2021
    3 Configuration menu
    Copy the full SHA
    95f1996 View commit details
    Browse the repository at this point in the history

  2. chore(contributing): create recommended extensions.json (#18511)

    @flotwig
    flotwig committed Oct 18, 2021
    4 Configuration menu
    Copy the full SHA
    214994b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into clean-up-gitignore

    @emilyrohrbough
    emilyrohrbough committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    6be0fa4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18512 from cypress-io/clean-up-gitignore

    @emilyrohrbough
    emilyrohrbough committed Oct 18, 2021
    3 Configuration menu
    Copy the full SHA
    6c423e5 View commit details
    Browse the repository at this point in the history

  5. chore: move server e2e tests to system-tests (#16354) 

    Co-authored-by: Brian Mann <brian.mann86@gmail.com>
Co-authored-by: Zach Bloomquist <git@chary.us>
Co-authored-by: Zach Bloomquist <github@chary.us>
    @JessicaSachs @brian-mann @flotwig
    4 people committed Oct 18, 2021
    4 Configuration menu
    Copy the full SHA
    a045e4f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. chore: Update Chrome (beta) to 95.0.4638.54

    cypress-bot[bot] committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    2a7578f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18542 from cypress-io/update-chrome-stable-from-9… 

    …4.0.4606.81-beta-from-95.0.4638.49
    @emilyrohrbough
    emilyrohrbough committed Oct 19, 2021
    4 Configuration menu
    Copy the full SHA
    28e7807 View commit details
    Browse the repository at this point in the history

  3. fix(cypress/react): disable react-refresh for craco setups (#18517) 

    Co-authored-by: Barthélémy Ledoux <bart@cypress.io>
    @mohatt @elevatebart
    mohatt and elevatebart committed Oct 19, 2021
    3 Configuration menu
    Copy the full SHA
    ea10795 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. merge in develop

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    5754b2c View commit details
    Browse the repository at this point in the history

  2. merge conflicts

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    a967745 View commit details
    Browse the repository at this point in the history

  3. conflicts

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    a3c0d6c View commit details
    Browse the repository at this point in the history

  4. update yarn lock

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    13cb962 View commit details
    Browse the repository at this point in the history

  5. wip - fixing e2e infra

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    571080d View commit details
    Browse the repository at this point in the history

  6. move launchpad example projects to system tets

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    9bcb46d View commit details
    Browse the repository at this point in the history

  7. fix incorrect merge

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    e6cf765 View commit details
    Browse the repository at this point in the history

  8. remove typelint for now

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    2290edf View commit details
    Browse the repository at this point in the history

  9. remove typelint for now

    @lmiller1990
    lmiller1990 committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    21e1df0 View commit details
    Browse the repository at this point in the history