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

Ports - Sav & Angela #9

Open
wants to merge 112 commits into
base: master
Choose a base branch
from
Open

Ports - Sav & Angela #9

wants to merge 112 commits into from

Commits on Jun 24, 2019

  1. added components folder and MovieLibrary component

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    6a9d1c1 View commit details
    Browse the repository at this point in the history

  2. router dom installed

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    6a3504e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/AngelaOh/video-store-cons… 

    …umer
    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    e7943c0 View commit details
    Browse the repository at this point in the history

  4. created MovieLibrary component

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    2a2b380 View commit details
    Browse the repository at this point in the history

  5. basic routes set up for homepage

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    46e25c8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1 from AngelaOh/homepage 

    Homepage - Basic routes setup
    @AngelaOh
    AngelaOh authored Jun 24, 2019
    Configuration menu
    Copy the full SHA
    9d899c4 View commit details
    Browse the repository at this point in the history

  7. able to view list of movies with MovieLibrary and Movie components

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    1237652 View commit details
    Browse the repository at this point in the history

  8. fixed merge conflicts

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    39d95d1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from AngelaOh/ao/movie_library_react 

    Ao/movie library react
    @qqdipps
    qqdipps authored Jun 24, 2019
    Configuration menu
    Copy the full SHA
    ff18067 View commit details
    Browse the repository at this point in the history

  10. passing callback func exploration

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    1968180 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into customerList

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    acf296c View commit details
    Browse the repository at this point in the history

  12. addeds select button in Movie component

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    49fbbd1 View commit details
    Browse the repository at this point in the history

  13. set up api request for customers didmount

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    66588de View commit details
    Browse the repository at this point in the history

  14. fixed bunches of bugs

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    2fe1ae9 View commit details
    Browse the repository at this point in the history

  15. added customer information to component

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    073a42d View commit details
    Browse the repository at this point in the history

  16. trying to add callback function for selectMovie

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    63c3327 View commit details
    Browse the repository at this point in the history

  17. add movie callback function connected

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    6dc9a8d View commit details
    Browse the repository at this point in the history

  18. added selecting customer functionality

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    07d57f4 View commit details
    Browse the repository at this point in the history

  19. passing movie as prop when selecting one movie

    @AngelaOh
    AngelaOh committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    55cf9e2 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #4 from AngelaOh/ao/movie_library_select 

    Ao/movie library select
    @qqdipps
    qqdipps authored Jun 24, 2019
    Configuration menu
    Copy the full SHA
    62d878a View commit details
    Browse the repository at this point in the history

  21. merge conf

    @qqdipps
    qqdipps committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    c4986f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. moved axios api request into separate method

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    812a319 View commit details
    Browse the repository at this point in the history

  2. fixed indentation and erased comments

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    100702f View commit details
    Browse the repository at this point in the history

  3. used spread operator to pass movie object into Movie

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    94ca94c View commit details
    Browse the repository at this point in the history

  4. more syntax cleanup

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    fe19caf View commit details
    Browse the repository at this point in the history

  5. added message in Router if movie is selected

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    2e682ca View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from AngelaOh/ao/movie_library_refactorings 

    Refactored Movie Library; Can Select Movie and Display at Top
    @qqdipps
    qqdipps authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    6e50bfa View commit details
    Browse the repository at this point in the history

  7. refactored homepage to reflect code style changes and temp display of… 

    … customers
    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    1cbb959 View commit details
    Browse the repository at this point in the history

  8. fixed display bug for customer

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    69b84c3 View commit details
    Browse the repository at this point in the history

  9. added a get request to Rails API in MovieSearch

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    3bc44e3 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/AngelaOh/video-store-cons… 

    …umer into ao/movie_search
    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    ce0fb47 View commit details
    Browse the repository at this point in the history

  11. set up scaffolding for checkOut component

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    333ca4b View commit details
    Browse the repository at this point in the history

  12. added lifecyle func to derive states from props after intialization o… 

    …f object
    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    06d9c70 View commit details
    Browse the repository at this point in the history

  13. sets state so SearchedMovies returns all movies from external databas… 

    …e based on search query
    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    acaad7a View commit details
    Browse the repository at this point in the history

  14. DOM renders list of searched movies

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    8dda284 View commit details
    Browse the repository at this point in the history

  15. refactored to functional componenet with callback, state not req

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    acf30f3 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #6 from AngelaOh/ao/movie_search 

    Movie Search Renders List of Searched Movies
    @qqdipps
    qqdipps authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    3c6ffc8 View commit details
    Browse the repository at this point in the history

  17. removed console.log

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    f4cbd3e View commit details
    Browse the repository at this point in the history

  18. Merge pull request #7 from AngelaOh/checkOut 

    Check out-component
    @AngelaOh
    AngelaOh authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    1be7acd View commit details
    Browse the repository at this point in the history

  19. added addToLibrary button

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    980a77e View commit details
    Browse the repository at this point in the history

  20. added post request for rental to callback, and update state to clear … 

    …selected items
    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    6e87710 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #8 from AngelaOh/checkOut 

    added post request for rental to callback, and update state to clear …
    @AngelaOh
    AngelaOh authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    fcd85b6 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into ao/add_to_library

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    581cc73 View commit details
    Browse the repository at this point in the history

  23. merge resolved

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    d6080da View commit details
    Browse the repository at this point in the history

  24. added proptypes to all child components

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    ae532a3 View commit details
    Browse the repository at this point in the history

  25. added customer.js proptypes

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    d552a73 View commit details
    Browse the repository at this point in the history

  26. finished PropTypes and erased unnecessary console.logs

    @AngelaOh
    AngelaOh committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    43a3d47 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #10 from AngelaOh/ao/add_proptypes 

    Added proptypes and cleaned up some spaces/console.logs
    @AngelaOh
    AngelaOh authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    42228cd View commit details
    Browse the repository at this point in the history

  28. added dynamic button display to movie

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    f285f2b View commit details
    Browse the repository at this point in the history

  29. conflict resolved

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    d08a45b View commit details
    Browse the repository at this point in the history

  30. debug conflict

    @qqdipps
    qqdipps committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    937d7dc View commit details
    Browse the repository at this point in the history

  31. Merge pull request #11 from AngelaOh/DynamicButtonDisplay 

    Dynamic button display
    @AngelaOh
    AngelaOh authored Jun 25, 2019
    Configuration menu
    Copy the full SHA
    330d6c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. added callback error massage method to movieSearch

    @qqdipps
    qqdipps committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    365cbd1 View commit details
    Browse the repository at this point in the history

  2. added callback error massage method to movieLibrary

    @qqdipps
    qqdipps committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    9c084df View commit details
    Browse the repository at this point in the history

  3. added callback error massage method to customerList

    @qqdipps
    qqdipps committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    f4fa53e View commit details
    Browse the repository at this point in the history

  4. added post request to add movie from exernal into library

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    f50a6f9 View commit details
    Browse the repository at this point in the history

  5. erased unnecessary console.logs

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    1a379f8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #12 from AngelaOh/ao/add_to_library_axios 

    Post Request to Add Video to Library
    @qqdipps
    qqdipps authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    24b4948 View commit details
    Browse the repository at this point in the history

  7. added Error Message component and implemeted callback func

    @qqdipps
    qqdipps committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    c5c4058 View commit details
    Browse the repository at this point in the history

  8. added bootstrap

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    562322f View commit details
    Browse the repository at this point in the history

  9. implemented clear error callback func and sent to components

    @qqdipps
    qqdipps committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    1456f4b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into errorHandling

    @AngelaOh
    AngelaOh authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    a468238 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #13 from AngelaOh/errorHandling 

    Error handling Components, callbacks (message and clear)
    @AngelaOh
    AngelaOh authored Jun 26, 2019
    Configuration menu
    Copy the full SHA
    4ccca71 View commit details
    Browse the repository at this point in the history

  12. added bootstrap button

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    b870dd9 View commit details
    Browse the repository at this point in the history

  13. added bootstrap cards for movie list display

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    b00d146 View commit details
    Browse the repository at this point in the history

  14. added bootstrap nav bar

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    e7a72c9 View commit details
    Browse the repository at this point in the history

  15. added customer cards

    @AngelaOh
    AngelaOh committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    dd11799 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. Merge pull request #14 from AngelaOh/ao/styling_movies 

    Styling customer, movie list, and nav bar
    @qqdipps
    qqdipps authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    ff99ff5 View commit details
    Browse the repository at this point in the history

  2. format auto

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    839da2f View commit details
    Browse the repository at this point in the history

  3. added welcomComponent and display logic

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    e066474 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into welcomeComponent

    @qqdipps
    qqdipps authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    759a65a View commit details
    Browse the repository at this point in the history

  5. fixed reload bug

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    3f60144 View commit details
    Browse the repository at this point in the history

  6. rearrange error placement and added boot strap alert to error

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    f97ae6e View commit details
    Browse the repository at this point in the history

  7. fixed bug in chechout for undfined func

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    af4933c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'welcomeComponent' into errorStyle

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    9a9cd3d View commit details
    Browse the repository at this point in the history

  9. styling and rearranging selected comp for CheckOut, looks ok, not great

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    8ef25f7 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #15 from AngelaOh/welcomeComponent 

    Welcome component && display logic
    @AngelaOh
    AngelaOh authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    ef08482 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #16 from AngelaOh/errorStyle 

    Error style -moved error component and add alert class
    @AngelaOh
    AngelaOh authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    622c94f View commit details
    Browse the repository at this point in the history

  12. Merge pull request #17 from AngelaOh/checkOutStyle 

    Check out style - not great looking, but maybe ok?
    @AngelaOh
    AngelaOh authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    7cfcbc8 View commit details
    Browse the repository at this point in the history

  13. added message when movie is added to library

    @AngelaOh
    AngelaOh committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    a8b44b8 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #18 from AngelaOh/ao/add_to_library_message 

    Added to Library Message
    @AngelaOh
    AngelaOh authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    1b26d3e View commit details
    Browse the repository at this point in the history

  15. refactoring errormessage to generic alert component

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    831655f View commit details
    Browse the repository at this point in the history

  16. merge conflict resolve in imports

    @qqdipps
    qqdipps committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    73d20eb View commit details
    Browse the repository at this point in the history

  17. added modal to show movie information on side

    @AngelaOh
    AngelaOh committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    05ead74 View commit details
    Browse the repository at this point in the history

  18. added margins for movie list

    @AngelaOh
    AngelaOh committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    d82e2d4 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2019

  1. fixed card sizes to be uniform

    @AngelaOh
    AngelaOh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    dd975d7 View commit details
    Browse the repository at this point in the history

  2. fixed button on movie

    @AngelaOh
    AngelaOh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    91f43cd View commit details
    Browse the repository at this point in the history

  3. refactoring message components to Alert

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    584cc39 View commit details
    Browse the repository at this point in the history

  4. refactored MovieSearch errormessage handling to alerts

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    8b7a108 View commit details
    Browse the repository at this point in the history

  5. refactored error messages to handling alerts

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    7840cba View commit details
    Browse the repository at this point in the history

  6. finished cleaning up and refactoring alerts and related callback func

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    7b67c43 View commit details
    Browse the repository at this point in the history

  7. removed unused var

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    7dc7daf View commit details
    Browse the repository at this point in the history

  8. Merge pull request #19 from AngelaOh/testing-modal 

    Added margins, changed ID to external ID, added modal to display movie information
    @qqdipps
    qqdipps authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    0b51c53 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'sd/refactor-error-to-alert'

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    bfd4725 View commit details
    Browse the repository at this point in the history

  10. updated add to library logic so button changes on click

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    787d5dd View commit details
    Browse the repository at this point in the history

  11. updating proptypes, func naming readability

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    d9e0e7e View commit details
    Browse the repository at this point in the history

  12. adding more prop types

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    ac3d888 View commit details
    Browse the repository at this point in the history

  13. added prop types for custom movie attr props

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    f856c96 View commit details
    Browse the repository at this point in the history

  14. changed select to selected on click

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    67aaf16 View commit details
    Browse the repository at this point in the history

  15. added button changes

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    b94497a View commit details
    Browse the repository at this point in the history

  16. Merge pull request #22 from AngelaOh/propTypes-double-check 

    Prop types double check, ALERT: updated func names
    @AngelaOh
    AngelaOh authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    73687d4 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #23 from AngelaOh/select-btn-change 

    Select btn change
    @AngelaOh
    AngelaOh authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    337267c View commit details
    Browse the repository at this point in the history

  18. alpha display of movies

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    aac4513 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #24 from AngelaOh/alpha-display 

    alpha display of movies
    @qqdipps
    qqdipps authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    e9676db View commit details
    Browse the repository at this point in the history

  20. disabled button if movies have already been added

    @AngelaOh
    AngelaOh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    fec100a View commit details
    Browse the repository at this point in the history

  21. Merge pull request #25 from AngelaOh/movie_button 

    disabled button if movies have already been added
    @AngelaOh
    AngelaOh authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    4157c08 View commit details
    Browse the repository at this point in the history

  22. added disabled button for movie selected, comented out sorting line i… 

    …n movieLibrary
    @AngelaOh
    AngelaOh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    9dc5049 View commit details
    Browse the repository at this point in the history

  23. fixing alpha bug

    @qqdipps
    qqdipps committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    98f1ca5 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #26 from AngelaOh/disable_movie_library_button 

    added disabled button for movie selected
    @qqdipps
    qqdipps authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    1551251 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' into test_master

    @qqdipps
    qqdipps authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    385d496 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #27 from AngelaOh/test_master 

    fixing alpha bug
    @qqdipps
    qqdipps authored Jun 28, 2019
    Configuration menu
    Copy the full SHA
    5e46d85 View commit details
    Browse the repository at this point in the history

  27. got rid of spaces

    @AngelaOh
    AngelaOh committed Jun 28, 2019
    Configuration menu
    Copy the full SHA
    053bbf2 View commit details
    Browse the repository at this point in the history