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.

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

Add subtitle search SFC #6727

Merged
merged 25 commits into from
Jun 6, 2019
Merged

Add subtitle search SFC #6727

merged 25 commits into from
Jun 6, 2019

Commits on May 25, 2019

  1. Add SFC subtitle-search.vue

    p0psicles committed May 25, 2019
    Configuration menu
    Copy the full SHA
    e0695d1 View commit details
    Browse the repository at this point in the history
  2. Add the component itself.

    p0psicles committed May 25, 2019
    Configuration menu
    Copy the full SHA
    ce17f32 View commit details
    Browse the repository at this point in the history
  3. Add jest test

    p0psicles committed May 25, 2019
    Configuration menu
    Copy the full SHA
    3afb8e8 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2019

  1. Merge remote-tracking branch 'remotes/origin/develop' into feature/ad…

    …d-subtitle-search-sfc
    
    # Conflicts:
    #	themes-default/slim/src/components/index.js
    #	themes/dark/assets/js/medusa-runtime.js
    #	themes/light/assets/js/medusa-runtime.js
    p0psicles committed May 26, 2019
    Configuration menu
    Copy the full SHA
    754001e View commit details
    Browse the repository at this point in the history

Commits on May 27, 2019

  1. Add new fixtures for jest tests.

    * show detailed object
    * show episodes (array of episodes for specific show)
    * subtitle-search.js (result or manual searched subtitles for specific show)
    p0psicles committed May 27, 2019
    Configuration menu
    Copy the full SHA
    cd8c922 View commit details
    Browse the repository at this point in the history
  2. Added jest test for subtitle-search.vue component.

    * Added snapshot.
    p0psicles committed May 27, 2019
    Configuration menu
    Copy the full SHA
    6740348 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. Added snapshot

    p0psicles committed May 29, 2019
    Configuration menu
    Copy the full SHA
    63642d0 View commit details
    Browse the repository at this point in the history
  2. Fix eslint warnings.

    p0psicles committed May 29, 2019
    Configuration menu
    Copy the full SHA
    025366d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9be825f View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'remotes/origin/develop' into feature/ad…

    …d-subtitle-search-sfc
    
    # Conflicts:
    #	themes/dark/assets/js/medusa-runtime.js
    #	themes/light/assets/js/medusa-runtime.js
    p0psicles committed May 29, 2019
    Configuration menu
    Copy the full SHA
    e31e5f0 View commit details
    Browse the repository at this point in the history
  5. Yarn dev after rebase.

    p0psicles committed May 29, 2019
    Configuration menu
    Copy the full SHA
    a77a3b9 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. Configuration menu
    Copy the full SHA
    3c9abf0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c21052a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2019

  1. Configuration menu
    Copy the full SHA
    6aabce1 View commit details
    Browse the repository at this point in the history
  2. Remove 'this'.

    p0psicles committed Jun 1, 2019
    Configuration menu
    Copy the full SHA
    1c32bd7 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2019

  1. Configuration menu
    Copy the full SHA
    b7dce65 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. Merge remote-tracking branch 'remotes/origin/develop' into feature/ad…

    …d-subtitle-search-sfc
    
    # Conflicts:
    #	themes/dark/assets/js/medusa-runtime.js
    #	themes/light/assets/js/medusa-runtime.js
    p0psicles committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    a131dd3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cab1ca5 View commit details
    Browse the repository at this point in the history
  3. linting

    p0psicles committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    3c72e89 View commit details
    Browse the repository at this point in the history
  4. build

    p0psicles committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    6193880 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7d8adc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2019

  1. Fix date-fns getting bundled twice

    (Possibly a better fix for `tablesorter` too)
    sharkykh committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    9cda490 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b33d3c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    210f456 View commit details
    Browse the repository at this point in the history
  4. Lint

    sharkykh committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    f6fecd1 View commit details
    Browse the repository at this point in the history