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

Feature/drm UI #3659

Merged
merged 15 commits into from
Jun 9, 2021
Merged

Feature/drm UI #3659

merged 15 commits into from
Jun 9, 2021

Commits on May 31, 2021

  1. Initial commit, changed DRM selection, added Clearkey, added manual H… 

    …TTP-Header
    @ShikiSeiren
    ShikiSeiren committed May 31, 2021
    Configuration menu
    Copy the full SHA
    f441f7a View commit details
    Browse the repository at this point in the history

  2. Added priority-selection

    @ShikiSeiren
    ShikiSeiren committed May 31, 2021
    Configuration menu
    Copy the full SHA
    cbc764d View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Added method to provide multiple request headers, added switching bet… 

    …ween input modes for Clearkey, added handling DRM-data provided by sources.json
    @ShikiSeiren
    ShikiSeiren committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    695de4e View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Added logic to make Clearkey work with the new drm-handling, added ha… 

    …ndling additional incoming parameters.
    @ShikiSeiren
    ShikiSeiren committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    be2c0dc View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Removed X-AxDRM-Message being a default field, added Popup to specify… 

    … multiple KID=KEY pairs, fixed error in handleRequestHeaders logic
    @ShikiSeiren
    ShikiSeiren committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    024e198 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Fixed unintended/missing behaviour when calling doLoad() with manuall… 

    …y set DRM
    @ShikiSeiren
    ShikiSeiren committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    d63334f View commit details
    Browse the repository at this point in the history

  2. Rollback of unintentional changes to package.json and package-lock.json

    @ShikiSeiren
    ShikiSeiren committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    15cb965 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' of https://github.com/Dash-Industry-Forum/… 

    …dash.js into feature/drm-ui

� Conflicts:
�	samples/dash-if-reference-player/app/css/main.css
�	samples/dash-if-reference-player/dashjs_config.json
    @dsilhavy
    dsilhavy committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    8898634 View commit details
    Browse the repository at this point in the history

  4. Removed default server-url

    @ShikiSeiren
    ShikiSeiren committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    2c18ef7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/drm-ui' of https://github.com/fraunhoferfokus/d… 

    …ash.js into feature/drm-ui
    @ShikiSeiren
    ShikiSeiren committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    7774354 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Removed commented code, added hr element between each key-value pair … 

    …in dialogue windows
    @ShikiSeiren
    ShikiSeiren committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    11359bc View commit details
    Browse the repository at this point in the history

  2. Changed time the UI is adjusted from loading the video to selecting t… 

    …he URL.
    @ShikiSeiren
    ShikiSeiren committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    e1ba981 View commit details
    Browse the repository at this point in the history

  3. Fixed old DRM data persisting on selecting a new stream.

    @ShikiSeiren
    ShikiSeiren committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    17bd00a View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Merge branch 'development' of https://github.com/Dash-Industry-Forum/… 

    …dash.js into feature/drm-ui
    @dsilhavy
    dsilhavy committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    b0b072a View commit details
    Browse the repository at this point in the history

  2. Minor Ui changes for DRM menu

    @dsilhavy
    dsilhavy committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    319da84 View commit details
    Browse the repository at this point in the history