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

Video filters and transforms #826

Merged
merged 8 commits into from
Oct 22, 2020
Merged

Video filters and transforms #826

merged 8 commits into from
Oct 22, 2020

Commits on Oct 12, 2020

  1. Video filters and transforms

    @JoeSmithStarkers
    JoeSmithStarkers committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    e2e1b18 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/stashapp/stash into feat… 

    …ure/video_filters_and_transforms

Fix conflicting imports of react-boostrap.

Conflicts:
	ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
    @JoeSmithStarkers
    JoeSmithStarkers committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    3fb6c38 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. Remove unnecessary text

    @WithoutPants
    WithoutPants committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    f80232f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into prs/826

    @WithoutPants
    WithoutPants committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    e56a3ba View commit details
    Browse the repository at this point in the history

  3. Refactor and mobile fixes

    @WithoutPants
    WithoutPants committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    8084a38 View commit details
    Browse the repository at this point in the history

  4. Lint and format

    @WithoutPants
    WithoutPants committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    989c1e4 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/develop' into prs/826

    @WithoutPants
    WithoutPants committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    d360a11 View commit details
    Browse the repository at this point in the history

  6. Add changelog entry

    @WithoutPants
    WithoutPants committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    a98dcb7 View commit details
    Browse the repository at this point in the history