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

Feature/settings url #3865

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
b272b18
Merge pull request #588 from AkamaiDASH/master
Jun 12, 2015
b1d08a3
Merge branch 'refs/heads/development'
Sep 8, 2015
042ea1d
Building min files for master release
Sep 8, 2015
ba275e6
merging release 1.5.1
Oct 14, 2015
4a168d7
adding dist files.
Oct 14, 2015
38490a1
Merge branch 'refs/heads/development'
Feb 12, 2016
3f1c80c
Pushing dist files to master
Feb 12, 2016
f8a1e50
Merge branch 'refs/heads/development'
Feb 12, 2016
aa5a7db
"here" links are evil
smedegaard Mar 21, 2016
8683028
removed extra space. Added period.
smedegaard Mar 23, 2016
d5ff90b
Merge pull request #1263 from smedegaard/patch-1
Mar 25, 2016
beacd65
Merge branch 'refs/heads/development'
Apr 15, 2016
df783ac
Merge branch 'master' of https://github.com/Dash-Industry-Forum/dash.js
Apr 15, 2016
4278a76
pushing dist files to master
Apr 15, 2016
b1d8ed7
Merge branch 'refs/heads/development'
Apr 21, 2016
c5793a6
Adding dist files to release.
Apr 21, 2016
00bd677
Merge branch 'refs/heads/development'
Jul 6, 2016
990c67c
adding dist files to master
Jul 6, 2016
71d7f5a
Merge branch 'refs/heads/development'
Sep 2, 2016
fcc98d4
dist files for release
Sep 2, 2016
223335b
Merge branch 'refs/heads/development'
Dec 21, 2016
28952ed
dist files for master release
Dec 21, 2016
581663c
dist files
Dec 21, 2016
5107f3f
Merge branch 'refs/heads/development'
Feb 1, 2017
77835b8
addind dist files for release
Feb 1, 2017
d389aed
Merge branch 'refs/heads/development'
Apr 27, 2017
a114c87
dist files for v2.5.0 release
Apr 27, 2017
6d79235
Merge branch 'refs/heads/development'
Sep 1, 2017
abe338d
adding dist files to master for release v2.6.0
Sep 1, 2017
0914c64
Merge branch 'development'
jeoliva Oct 11, 2017
e9d834a
Add dist files to master for release v2.6.1
jeoliva Oct 11, 2017
6c8d61d
Merge branch 'development'
jeoliva Oct 12, 2017
d91aca5
Add v2.6.2 dist files
jeoliva Oct 12, 2017
b1aad9f
Update version to 2.6.2
jeoliva Oct 12, 2017
81458cf
Merge branch 'development'
jeoliva Oct 16, 2017
2af44f8
Merge branch 'development'
jeoliva Nov 8, 2017
857720d
Add v2.6.3 dist files
jeoliva Nov 8, 2017
a337075
Merge branch 'development'
jeoliva Dec 6, 2017
de27d6d
Add v2.6.4 dist files
jeoliva Dec 6, 2017
650035d
Merge branch 'development'
jeoliva Jan 11, 2018
923c5b5
Add v2.6.5 dist files
jeoliva Jan 11, 2018
363caf5
Merge branch 'development'
jeoliva Feb 14, 2018
e863848
Update dist files to v2.6.6
jeoliva Feb 14, 2018
1f21e4d
Merge branch 'development'
jeoliva Mar 14, 2018
e2394a6
Add v2.6.7 dist files
jeoliva Mar 14, 2018
466bfe1
Merge branch 'development'
jeoliva Apr 30, 2018
888cdcc
Add v2.6.8 dist files
jeoliva Apr 30, 2018
4cf8733
Merge branch 'development'
jeoliva May 30, 2018
89f738a
Add v2.7.0 dist files
jeoliva May 30, 2018
e6da1f0
Merge branch 'development'
jeoliva Jul 3, 2018
a9e4ba9
Add v2.8.0 dist files
jeoliva Jul 3, 2018
a7f0942
Merge branch 'development'
jeoliva Aug 1, 2018
0420f9c
Add v2.9.0 dist files
jeoliva Aug 1, 2018
b65f4c8
Merge branch 'development'
jeoliva Oct 1, 2018
0c68888
Add v2.9.1 dist files
jeoliva Oct 1, 2018
bb3b888
Merge branch 'development'
jeoliva Oct 29, 2018
a77e526
Add v2.9.2 dist files
jeoliva Oct 29, 2018
45fdf42
Merge branch 'development'
jeoliva Feb 12, 2019
acda4c4
Add v2.9.3 dist files
jeoliva Feb 12, 2019
b0f46e8
Merge branch 'development'
jeoliva Jun 29, 2019
b90898e
Add v3.0.0 dist files
jeoliva Jun 29, 2019
6bcb89a
Merge branch 'development'
jeoliva Dec 4, 2019
3ff323e
Add v3.0.1 dist files
jeoliva Dec 4, 2019
637768a
Move ESLint check to prod config
dsilhavy Jun 7, 2021
f3f1773
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 8, 2021
1fdabd5
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 8, 2021
0934482
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 9, 2021
468944c
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 11, 2021
fe506cb
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 11, 2021
f99f65f
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 11, 2021
4d464fe
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 14, 2021
2f1d351
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 18, 2021
5f36c4b
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 18, 2021
6a8cbad
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 25, 2021
3fb5591
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 26, 2021
37f8408
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 26, 2021
938e556
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 28, 2021
df8fabd
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 29, 2021
8b45fba
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jun 29, 2021
adcc6fa
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jul 1, 2021
3b44151
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jul 12, 2021
07f8c99
[MSS] fix text track switch for live streams (#3698)
bbert Jul 14, 2021
aed877f
Merge branch 'Dash-Industry-Forum:development' into development
dsilhavy Jul 14, 2021
681d840
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jul 28, 2021
9426a84
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Sep 2, 2021
d50974c
Merge branch 'master' of https://github.com/fraunhoferfokus/dash.js i…
ShikiSeiren Jan 17, 2022
a449506
Initial Commit settings URL
ShikiSeiren Jan 17, 2022
4d758e9
Added view-updating for textboxes and radio buttons
ShikiSeiren Jan 18, 2022
1d702d2
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Jan 18, 2022
73de36c
Updated and fixed for 4.3.0
ShikiSeiren Jan 18, 2022
6e6aac8
Fixed utcsync url when copying, added query length check
ShikiSeiren Jan 26, 2022
0392eee
Added dist folder to gitignore.
ShikiSeiren Jan 26, 2022
8a84b79
Removed dist folder
ShikiSeiren Jan 26, 2022
e917956
Adjusted gitignore
ShikiSeiren Jan 26, 2022
08e9218
Merge branch 'Dash-Industry-Forum:development' into feature/settings-url
ShikiSeiren Jan 26, 2022
28c423e
Fixed Error caused by double & in URL, added PopUp noification when U…
ShikiSeiren Feb 7, 2022
2e6bca4
Merge branch 'feature/settings-url' of https://github.com/fraunhoferf…
ShikiSeiren Feb 7, 2022
45f7e67
Add callout box for new feature
dsilhavy Feb 14, 2022
751334a
Add missing DRM today parameter to export
dsilhavy Feb 14, 2022
7bfca26
Fixed Errors with handling MPD- and Licenseserver URLS containing the…
ShikiSeiren Feb 16, 2022
9cd1854
Fixed Errors with handling MPD- and Licenseserver URLS containing the…
ShikiSeiren Feb 16, 2022
889d57b
Fixed Errors with handling MPD- and Licenseserver URLS containing the…
ShikiSeiren Feb 16, 2022
195f1ee
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
dsilhavy Feb 18, 2022
c6ca7a7
Remove isValidUrl
dsilhavy Feb 18, 2022
545dde4
Adjust export settings text
dsilhavy Feb 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion samples/dash-if-reference-player/app/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,29 @@ DRM Header Dialogue
cursor: pointer;
}

/********************************************************
Copy Settings URL Popup
*********************************************************/

.copyPopup {
display: none;
position: fixed;
z-index: 1;
top: 0;
right: 0;
overflow: auto;
text-align: center;
}

.copyPopupContent {
display: inline-block;
background-color: #fefefe;
padding: 5px;
border: 1px solid #888;
font-size: large;
width: 100%; /* Could be more or less, depending on screen size */
}

/********************************************************
BS Information
*********************************************************/
Expand All @@ -662,6 +685,10 @@ BS Information
border-left-color: #136bfb ;
}

.bs-callout-success {
border-left-color: #5cb85c ;
}

.bs-callout-danger {
border-left-color: #CA0B00;
}
}
Loading