Skip to content

Commit f932235

Browse files
mekyamekya
authored
Merge branch 'master' into newPlaybackParams
2 parents 2cfc59f + e4e451f commit f932235

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3390
-3070
lines changed

‎src/main/webapp/cam_play.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h3 class="col text-muted">Embedded SDK WebRTC Cam Player</h3>
7070
</div>
7171
</body>
7272

73-
<script src="js/external/jquery-3.4.1.min.js" crossorigin="anonymous"></script>
73+
<script src="js/external/jquery-3.7.1.min.js" crossorigin="anonymous"></script>
7474
<script src="js/external/notify.min.js" crossorigin="anonymous"></script>
7575

7676
<script type="module">

‎src/main/webapp/canvas-player.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ <h3 class="col text-muted">WebRTC Play</h3>
199199
</footer>
200200

201201

202-
<script src="js/external/jquery-3.4.1.min.js" crossorigin="anonymous"></script>
202+
<script src="js/external/jquery-3.7.1.min.js" crossorigin="anonymous"></script>
203203
<script src="js/external/popper.min.js" crossorigin="anonymous"></script>
204204
<script src="js/external/bootstrap.min.js" crossorigin="anonymous"></script>
205205
<script src="js/external/notify.min.js" crossorigin="anonymous"></script>

‎src/main/webapp/canvas-publish.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="css/common.css" />
1010
<script src="js/external/adapter-latest.js"></script>
1111

12-
<script src="js/external/jquery-3.4.1.min.js"></script>
12+
<script src="js/external/jquery-3.7.1.min.js"></script>
1313
<script src="js/external/popper.min.js"></script>
1414
<script src="js/external/bootstrap.min.js"></script>
1515

@@ -224,7 +224,7 @@ <h3 class="col text-muted">WebRTC Publish</h3>
224224

225225
</body>
226226

227-
<script src="js/external/jquery-3.4.1.min.js" crossorigin="anonymous"></script>
227+
<script src="js/external/jquery-3.7.1.min.js" crossorigin="anonymous"></script>
228228
<script src="js/external/notify.min.js" crossorigin="anonymous"></script>
229229

230230
<script type="module" lang="javascript">

‎src/main/webapp/conference-deprecated.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
href="css/external/bootstrap4/bootstrap.min.css"
88
>
99
<script src="js/external/adapter-latest.js"></script>
10-
<script src="js/external/jquery-3.4.1.min.js"></script>
10+
<script src="js/external/jquery-3.7.1.min.js"></script>
1111
<link rel="stylesheet" href="css/common.css" />
1212
<style>
1313
video {

‎src/main/webapp/conference-room.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ <h5 class="modal-title" id="shareUrlLocationModalLabel">Send an invitation to yo
141141

142142
</div>
143143

144-
<script src="js/external/jquery-3.3.1.slim.min.js"></script>
144+
<script src="js/external/jquery-3.7.1.slim.min.js"></script>
145145
<script src="js/external/popper.min.js"></script>
146146
<script src="js/external/bootstrap.min.js"></script>
147147
<script src="js/external/notify.min.js"></script>

‎src/main/webapp/conference.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta charset="UTF-8">
77
<link rel="stylesheet" href="css/external//bootstrap4/bootstrap.min.css">
88
<script src="js/external/adapter-latest.js"></script>
9-
<script src="js/external/jquery-3.4.1.min.js"></script>
9+
<script src="js/external/jquery-3.7.1.min.js"></script>
1010
<script src="js/external/notify.min.js" crossorigin="anonymous"></script>
1111
<link rel="stylesheet" href="css/common.css" />
1212
<style>
@@ -885,4 +885,4 @@ <h3 class="col text-muted">WebRTC Multitrack Conference</h3>
885885
</body>
886886
<script src="./js/external/notify.min.js" crossorigin="anonymous"></script>
887887

888-
</html>
888+
</html>

‎src/main/webapp/css/external/bootstrap4/bootstrap-grid.css‎

100755100644
Lines changed: 170 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/css/external/bootstrap4/bootstrap-grid.css.map‎

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/css/external/bootstrap4/bootstrap-grid.min.css‎

100755100644
Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/css/external/bootstrap4/bootstrap-grid.min.css.map‎

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)