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

Merge master into develop #4778

Merged
merged 11 commits into from
Jul 28, 2018
Merged

Merge master into develop #4778

merged 11 commits into from
Jul 28, 2018

Commits on Jul 27, 2018

  1. Merge pull request #4763 from pymedusa/release/release-0.2.7 

    Release 0.2.7
    @p0psicles
    p0psicles authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    b733355 View commit details
    Browse the repository at this point in the history

  2. Add pids to js files in main.mako

    @p0psicles
    p0psicles committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    17e4fb0 View commit details
    Browse the repository at this point in the history

  3. Fix

    @sharkykh
    sharkykh committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    a0b6585 View commit details
    Browse the repository at this point in the history

  4. Fix home tabs (#4764) 

    * Fix home tabs

* Update CHANGELOG.md
    @sharkykh
    sharkykh committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    a8bb16f View commit details
    Browse the repository at this point in the history

  5. Update changelog

    @sharkykh
    sharkykh committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    e81cae2 View commit details
    Browse the repository at this point in the history

  6. Bump version

    @sharkykh
    sharkykh committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    421ad5e View commit details
    Browse the repository at this point in the history

  7. Fix assets not showing on load on small and banner layouts

    @sharkykh
    sharkykh committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    a6be2f8 View commit details
    Browse the repository at this point in the history

  8. Update CHANGELOG.md

    @sharkykh
    sharkykh authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    3637619 View commit details
    Browse the repository at this point in the history

  9. Fix #4775 - error when trying to rename episodes

    @sharkykh
    sharkykh committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    83d03d0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #4774 from pymedusa/hotfix/add-pids-to-js 

    Hotfix: v0.2.8
    @medariox
    medariox authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    f5973b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2018

  1. Merge branch 'master' into develop

    @sharkykh
    sharkykh committed Jul 28, 2018
    Configuration menu
    Copy the full SHA
    0fe2d62 View commit details
    Browse the repository at this point in the history