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

Status bar error state improvements #3299

Merged
merged 8 commits into from Nov 15, 2021
Merged

Status bar error state improvements #3299

merged 8 commits into from Nov 15, 2021

Commits on Nov 4, 2021

  1. Status bar improvements

    @Murderlon
    Murderlon committed Nov 4, 2021
    Copy the full SHA
    418ec54 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Revert dashboard.html styles, improve layout of error state

    @Murderlon
    Murderlon committed Nov 8, 2021
    Copy the full SHA
    7b1c153 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into status-error-state 

    * main:
  @uppy/aws-s3: use `Promise.allSettled` insead of custom utils (#3079)
  Convert sets to arrays prior to using spread operator to enable transpilation to ES5 (#3297)
  Add showRecordingLength to webcam types (#3303)
  Required meta fields UI (#3285)
  Update BACKLOG.md
  Release uppy@2.2.2
  @uppy/provider-views@2.0.5
    @Murderlon
    Murderlon committed Nov 8, 2021
    Copy the full SHA
    c1e2296 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Merge branch 'main' into status-error-state

    @arturi
    arturi committed Nov 9, 2021
    Copy the full SHA
    d4f396b View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2021

  1. Merge branch 'main' into status-error-state 

    * main:
  Refactor locale scripts & generate types and docs (#3276)
  Remove references of incorrect `options` argument for `companion.socket` (#3307)
  Upgrade linting to 2.0.0-0 (#3280)
  Release uppy@2.1.2, @uppy/robodog@2.1.3
  @uppy/core@2.1.2
  meta: update version references in docs
  Release @uppy/robodog@2.1.2
  @uppy/unsplash@2.0.3
    @Murderlon
    Murderlon committed Nov 11, 2021
    Copy the full SHA
    697171b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'status-error-state' of https://github.com/transloadit/uppy 

     into status-error-state

* 'status-error-state' of https://github.com/transloadit/uppy:
    @Murderlon
    Murderlon committed Nov 11, 2021
    Copy the full SHA
    6e638e9 View commit details
    Browse the repository at this point in the history

  3. Revert accidental change in Uploader

    @Murderlon
    Murderlon committed Nov 11, 2021
    Copy the full SHA
    a621dff View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Fix locale string which got lost in merge

    @Murderlon
    Murderlon committed Nov 12, 2021
    Copy the full SHA
    893489a View commit details
    Browse the repository at this point in the history