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

Background Media support: relevant Video updates + basic implementation #194

Merged
merged 39 commits into from
Feb 5, 2020
Merged

Background Media support: relevant Video updates + basic implementation #194

merged 39 commits into from
Feb 5, 2020

Commits on Jan 27, 2020

  1. Start adding basic background implementation. 

    Signed-off-by: Miina Sikk <miina.sikk@gmail.com>
    @miina
    miina committed Jan 27, 2020
    Configuration menu
    Copy the full SHA
    5c2113c View commit details
    Browse the repository at this point in the history

  2. Add background panel. 

    Signed-off-by: Miina Sikk <miina.sikk@gmail.com>
    @miina
    miina committed Jan 27, 2020
    Configuration menu
    Copy the full SHA
    dd316ed View commit details
    Browse the repository at this point in the history

  3. Fix setting background image.

    @miina
    miina committed Jan 27, 2020
    Configuration menu
    Copy the full SHA
    ac45f5a View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2020

  1. Replace isFullbleed with isFill

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    e6674ad View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into add/25-background-m… 

    …edia-support
    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    3616be9 View commit details
    Browse the repository at this point in the history

  3. Allow adding video as background.

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    71bb029 View commit details
    Browse the repository at this point in the history

  4. Add initial FE implementation.

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    05b6285 View commit details
    Browse the repository at this point in the history

  5. Add preview for video.

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    efcc76b View commit details
    Browse the repository at this point in the history

  6. Adjust Preview and Save for Image

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    87ee216 View commit details
    Browse the repository at this point in the history

  7. Remove unused InputGroup

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    0276e26 View commit details
    Browse the repository at this point in the history

  8. Enable panning for background image.

    @miina
    miina committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    36fe49e View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2020

  1. Add panning and edit to video.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    bd5af0c View commit details
    Browse the repository at this point in the history

  2. Finalize video edit without background.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    034c2bd View commit details
    Browse the repository at this point in the history

  3. Fix background video display.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    19042c0 View commit details
    Browse the repository at this point in the history

  4. Initial conflct merge from master.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    d1e8e57 View commit details
    Browse the repository at this point in the history

  5. Partial fixes from merge.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    39e25a7 View commit details
    Browse the repository at this point in the history

  6. More fix tries.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    9abbd43 View commit details
    Browse the repository at this point in the history

  7. Fix panning.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    aecc5bd View commit details
    Browse the repository at this point in the history

  8. Fix scaled display.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    c7fd989 View commit details
    Browse the repository at this point in the history

  9. Remove unneeded params.

    @miina
    miina committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    1decfea View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. Remove autplay fron display.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    4b8a361 View commit details
    Browse the repository at this point in the history

  2. Merge master & resolve conflicts.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    40d0b0f View commit details
    Browse the repository at this point in the history

  3. Update styled.css

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    4a171d4 View commit details
    Browse the repository at this point in the history

  4. Keep ratio when resizing video.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    269eb2f View commit details
    Browse the repository at this point in the history

  5. Reuse some code between video and image.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    0d62e3f View commit details
    Browse the repository at this point in the history

  6. Reuse pan movable for media.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    67b371f View commit details
    Browse the repository at this point in the history

  7. Remove old comment.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    afebc98 View commit details
    Browse the repository at this point in the history

  8. Remove some more old unused code.

    @miina
    miina committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    bcfed72 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2020

  1. Add isMedia type definition.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    87d433e View commit details
    Browse the repository at this point in the history

  2. Only display background panel with single selection.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    3133ea0 View commit details
    Browse the repository at this point in the history

  3. Separate functions from index.js file.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    94b41e1 View commit details
    Browse the repository at this point in the history

  4. Remove redundant spread operator.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    028e965 View commit details
    Browse the repository at this point in the history

  5. Move scalePanel to shared folder.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    9967846 View commit details
    Browse the repository at this point in the history

  6. Move cropbox to shared.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    87ea89f View commit details
    Browse the repository at this point in the history

  7. Move isBackground to reducer.

    @miina
    miina committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    1d81857 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2020

  1. Remove redundant attribute.

    @miina
    miina committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    57ac782 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts.

    @miina
    miina committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    9ebff1a View commit details
    Browse the repository at this point in the history

  3. Update tests.

    @miina
    miina committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    d5071df View commit details
    Browse the repository at this point in the history

  4. Add clarifying comment.

    @miina
    miina committed Feb 5, 2020
    Configuration menu
    Copy the full SHA
    56f07cf View commit details
    Browse the repository at this point in the history