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

Bump axios from 0.24.0 to 1.6.0 #1596

Open
wants to merge 167 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
04da03f
Merge branch '0.160-2-ILM-5641-unapproved-pause-after' into dev
mirashAK May 5, 2023
7fcf253
Merge branch '0.160_16.02.2023_niki_ILM-3990' into dev
mirashAK May 5, 2023
3f27dc7
Merge branch '0.162-ILM-5765' into dev
evgeniylissin May 10, 2023
b34954b
Merge branch '0.160-fix-blockid-select' into dev
evgeniylissin May 10, 2023
4efdbdb
Merge pull request #1440 from irls/0.162-ILM-5557-fix
evgeniylissin May 11, 2023
ebadad3
Merge pull request #1441 from irls/0.161-3-ILM-5819
evgeniylissin May 12, 2023
1d3a5f3
Merge pull request #1442 from irls/0.160-fix-blockid-select
evgeniylissin May 12, 2023
7d7ad2d
Merge pull request #1443 from irls/0.161-3-ILM-5819
evgeniylissin May 12, 2023
0d83670
Merge branch '0.161-3-ILM-5819' into dev
evgeniylissin May 12, 2023
24191f1
Merge pull request #1444 from irls/0.161-3-ILM-5819
evgeniylissin May 12, 2023
8777447
Merge pull request #1445 from irls/0.162-ILM-5765
evgeniylissin May 16, 2023
ebc8b4e
Merge pull request #1446 from irls/0.160_16.02.2023_niki_ILM-3990
evgeniylissin May 16, 2023
da657a8
Merge pull request #1449 from irls/0.162-ILM-5765
evgeniylissin May 17, 2023
e08a8e8
Merge pull request #1450 from irls/0.162-ILM-5765
evgeniylissin May 17, 2023
e20d88c
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK May 17, 2023
a93e627
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK May 17, 2023
613e4dd
Merge pull request #1451 from irls/0.162-ILM-5765
evgeniylissin May 18, 2023
16cfb63
Merge pull request #1452 from irls/0.162-ILM-5765
evgeniylissin May 18, 2023
d426e54
Merge pull request #1453 from irls/0.162-ILM-5765
evgeniylissin May 19, 2023
8053882
Merge pull request #1454 from irls/0.162-ILM-5765
evgeniylissin May 19, 2023
9231827
Merge pull request #1455 from irls/0.162-ILM-5765
evgeniylissin May 22, 2023
fde0f39
Merge pull request #1456 from irls/0.162-ILM-5765
evgeniylissin May 22, 2023
2e053f0
Merge pull request #1457 from irls/0.162-ILM-5765
evgeniylissin May 23, 2023
b0ff595
Merge pull request #1458 from irls/0.162-ILM-5765
evgeniylissin May 23, 2023
dc08532
Merge pull request #1459 from irls/0.162-ILM-5765
evgeniylissin May 23, 2023
6dca9c7
Merge pull request #1460 from irls/0.162-ILM-5765
evgeniylissin May 23, 2023
a7f916e
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK May 23, 2023
134e6b8
Merge pull request #1461 from irls/0.162-ILM-5765
evgeniylissin May 24, 2023
9585952
Merge pull request #1462 from irls/0.162-ILM-5765
evgeniylissin May 24, 2023
3491700
Merge branch '0.161-ILM-5920-fix-console-errors' into dev
mirashAK May 25, 2023
3d95663
Merge pull request #1464 from irls/0.162-ILM-5765
evgeniylissin May 26, 2023
8ca0a8a
Merge pull request #1465 from irls/0.162-ILM-5765
evgeniylissin May 26, 2023
9f6e685
Merge pull request #1466 from irls/0.162-ILM-5765
evgeniylissin May 26, 2023
21cd14e
Merge pull request #1467 from irls/0.162-ILM-5765
evgeniylissin May 29, 2023
7b27dff
<bug>(ILM-5870): sticky TOC buttons
evgeniylissin May 29, 2023
6dbd978
Merge pull request #1468 from irls/0.162-ILM-5765-ILM-5870
evgeniylissin May 29, 2023
f98b1a8
Merge branch '0.162-ILM-5870' into dev
evgeniylissin May 29, 2023
679df7f
Merge pull request #1469 from irls/0.162-ILM-5765
evgeniylissin May 30, 2023
48e1a29
Merge pull request #1470 from irls/0.162-ILM-5765
evgeniylissin Jun 1, 2023
6263d43
Merge pull request #1471 from irls/0.162-ILM-5765
evgeniylissin Jun 1, 2023
8c2078c
Merge pull request #1472 from irls/0.162-ILM-5765
evgeniylissin Jun 1, 2023
7e6aafd
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK Jun 1, 2023
64ad374
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK Jun 2, 2023
b5ee0a7
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK Jun 2, 2023
e9d08e8
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
mirashAK Jun 2, 2023
02de3a4
Merge branch '0.161-ILM-5936-fix-init-edit-on-language-change' into dev
mirashAK Jun 2, 2023
e1f2e3f
Merge pull request #1474 from irls/0.162-ILM-5765
evgeniylissin Jun 9, 2023
17e971e
Merge pull request #1475 from irls/0.162-ILM-5765
evgeniylissin Jun 9, 2023
5532277
Merge pull request #1476 from irls/0.162-ILM-5870
evgeniylissin Jun 9, 2023
e06d59c
<bug>(ILM-5861): controls positions
evgeniylissin Jun 12, 2023
f10e910
Merge branch '0.162-ILM-5765' into dev
evgeniylissin Jun 12, 2023
5ff3642
Merge branch '0.162-ILM-5765-ILM-5870' into dev
evgeniylissin Jun 12, 2023
8258183
<bug>(ILM-5861): controls positions
evgeniylissin Jun 12, 2023
8f8a89f
Merge pull request #1478 from irls/0.162-ILM-5765-ILM-5870
evgeniylissin Jun 12, 2023
746de53
Merge pull request #1479 from irls/0.162-ILM-5765
evgeniylissin Jun 12, 2023
96eb050
Merge pull request #1480 from irls/0.162-ILM-5765
evgeniylissin Jun 12, 2023
623327a
Merge pull request #1481 from irls/0.162-ILM-5765
evgeniylissin Jun 12, 2023
1a7ff8d
Merge pull request #1482 from irls/0.162-ILM-5765
evgeniylissin Jun 12, 2023
4a0475b
Merge pull request #1483 from irls/0.162-ILM-5870
evgeniylissin Jun 13, 2023
0626a15
Merge pull request #1484 from irls/0.162-ILM-5870
evgeniylissin Jun 13, 2023
05a9d3f
Merge pull request #1485 from irls/0.162-ILM-5765
evgeniylissin Jun 14, 2023
e036d8d
Merge pull request #1486 from irls/0.162-ILM-5765
evgeniylissin Jun 14, 2023
b1d6d55
Merge pull request #1487 from irls/0.162-ILM-5765
evgeniylissin Jun 14, 2023
a62098f
Merge pull request #1489 from irls/0.162-ILM-5870
evgeniylissin Jun 15, 2023
6bf11af
Merge pull request #1491 from irls/0.162-ILM-5870
evgeniylissin Jun 16, 2023
564df8f
Merge branch '0.162-ILM-5820' into dev
evgeniylissin Jun 22, 2023
17a6445
Merge pull request #1496 from irls/0.161-ILM-5508
evgeniylissin Jun 23, 2023
6c823f0
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
Jun 26, 2023
157a5f7
Configurate collection grid for sortable
Jun 27, 2023
741db79
Merge branch '0.161-ILM-3420-fixes-combine-books-collections' into dev
Jun 27, 2023
9608a58
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
Jul 3, 2023
bc33385
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
Jul 3, 2023
19fa1fa
Merge branch '0.160-ILM-5493-sync-meta-fixes' into dev
Jul 3, 2023
8c8e477
Merge pull request #1497 from irls/0.162-ILM-5845
evgeniylissin Jul 11, 2023
a9871ba
Merge branch '0.162-ILM-5834' into dev
evgeniylissin Jul 13, 2023
98ee083
Merge branch '0.162-ILM-5834' into dev
evgeniylissin Jul 13, 2023
2f06128
Merge pull request #1498 from irls/0.162-ILM-5834
evgeniylissin Jul 13, 2023
fdc566d
<bug>(ILM-5867): update on report change
evgeniylissin Jul 17, 2023
854cf39
Merge pull request #1503 from irls/0.162-ILM-5867
evgeniylissin Jul 17, 2023
0010ac0
Merge pull request #1504 from irls/0.162-ILM-5765-fix
evgeniylissin Jul 18, 2023
4b144ce
Merge pull request #1506 from irls/0.161-ILM-5508
evgeniylissin Jul 24, 2023
e6e61e9
Merge pull request #1507 from irls/0.162-ILM-5860
evgeniylissin Jul 24, 2023
94fd67a
Merge branch '0.162-ILM-6051' into dev
evgeniylissin Jul 24, 2023
a62b2dc
Merge branch '0.163-fixes-meta-sync' into dev
Jul 24, 2023
752c271
Correctly close voicework popup
evgeniylissin Jul 25, 2023
d937598
Merge pull request #1508 from irls/0.163-ILM-4122-fix-voicework-change
evgeniylissin Jul 25, 2023
f2c0e44
Merge pull request #1509 from irls/0.161-ILM-5508
evgeniylissin Jul 26, 2023
1d05ac8
Merge pull request #1510 from irls/0.161-ILM-5508
evgeniylissin Jul 27, 2023
5a58cc6
Merge pull request #1516 from irls/0.161-ILM-5508
evgeniylissin Aug 3, 2023
56aca8c
Merge pull request #1517 from irls/0.161-ILM-5508
evgeniylissin Aug 3, 2023
9255595
Merge pull request #1518 from irls/0.161-ILM-5508
evgeniylissin Aug 3, 2023
ff07b06
Merge pull request #1519 from irls/0.161-ILM-5508
evgeniylissin Aug 7, 2023
35fe60d
Merge branch '0.163-ILM-5765-fix' into dev
evgeniylissin Aug 7, 2023
fc8af0c
Merge branch '0.163-ILM-5589-sync-cover-popups' into dev
Aug 8, 2023
4fbc486
Merge branch '0.163-ILM-5589-sync-cover-popups' into dev
Aug 8, 2023
0f37962
Merge pull request #1520 from irls/0.161-ILM-5508
evgeniylissin Aug 9, 2023
eeb89bb
Merge pull request #1521 from irls/0.161-ILM-5508
evgeniylissin Aug 9, 2023
e8c95c7
Merge pull request #1522 from irls/0.161-ILM-5508
evgeniylissin Aug 9, 2023
bf706f8
Merge pull request #1523 from irls/0.161-ILM-5508
evgeniylissin Aug 9, 2023
caff790
Merge pull request #1524 from irls/0.161-ILM-5508
evgeniylissin Aug 10, 2023
e77efc4
Merge pull request #1525 from irls/0.163-ILM-6043
evgeniylissin Aug 10, 2023
9d7e7e1
Merge pull request #1527 from irls/0.162-ILM-5834
evgeniylissin Aug 11, 2023
6248112
Merge pull request #1528 from irls/0.162-ILM-5834
evgeniylissin Aug 11, 2023
45624ba
Merge pull request #1529 from irls/0.162-ILM-5834
evgeniylissin Aug 14, 2023
45b1cc9
Merge pull request #1530 from irls/0.162-ILM-5834
evgeniylissin Aug 16, 2023
528cdd4
Merge pull request #1533 from irls/0.162-ILM-5834
evgeniylissin Aug 17, 2023
507e115
Merge branch '0.163-ILM-5589-sync-cover-popups' into dev
Aug 18, 2023
2190ef1
Merge pull request #1534 from irls/0.163-ILM-6070
evgeniylissin Aug 18, 2023
93eacda
Merge branch '0.163-ILM-5876-fix-filter-blinking' into dev
Aug 21, 2023
2b45487
Merge pull request #1535 from irls/0.162-ILM-5834
evgeniylissin Aug 22, 2023
0b5f709
Merge pull request #1536 from irls/0.163-ILM-5648
evgeniylissin Aug 22, 2023
6d0fe6f
Merge pull request #1537 from irls/0.163-ILM-6045
evgeniylissin Aug 23, 2023
62bc0e6
Merge pull request #1538 from irls/0.162-ILM-5834
evgeniylissin Aug 23, 2023
8f66d14
Merge pull request #1539 from irls/0.162-ILM-5834
evgeniylissin Aug 23, 2023
9c99954
Merge branch '0.162-ILM-5834' into dev
evgeniylissin Sep 4, 2023
0e94f10
Merge branch '0.163-ILM-5834' into dev
evgeniylissin Sep 4, 2023
4aca39e
Merge pull request #1540 from irls/0.163-ILM-6043
evgeniylissin Sep 6, 2023
9b316eb
Merge pull request #1541 from irls/0.163-ILM-5834
evgeniylissin Sep 7, 2023
0478bc8
Merge pull request #1542 from irls/0.163-ILM-6101
evgeniylissin Sep 7, 2023
9e7d5e6
Merge branch '0.163-ILM-5589-sync-cover-popups' into dev
Sep 7, 2023
0298cc7
Merge pull request #1543 from irls/0.163-ILM-5834
evgeniylissin Sep 11, 2023
c219cd7
<bug>(ILM-6110): check
evgeniylissin Sep 11, 2023
4696f96
Merge pull request #1544 from irls/0.163-ILM-6101
evgeniylissin Sep 11, 2023
f7b27f6
Merge pull request #1554 from irls/0.163-ILM-6043
evgeniylissin Sep 12, 2023
c429241
<bug>(ILM-6110): check play with exponential volume change
evgeniylissin Sep 14, 2023
cdb4e46
Merge branch '0.164-ILM-6195' into dev
evgeniylissin Sep 18, 2023
46c4564
Merge pull request #1559 from irls/0.163-ILM-6110
evgeniylissin Sep 20, 2023
f5d7ac1
Merge pull request #1560 from irls/0.163-ILM-5666
evgeniylissin Sep 20, 2023
7709568
Merge pull request #1561 from irls/0.163-ILM-5173
evgeniylissin Sep 20, 2023
268a636
Merge remote-tracking branch 'origin/0.163-ILM-6101' into dev
evgeniylissin Sep 22, 2023
b2e8b45
Merge pull request #1562 from irls/0.164-ILM-6139
evgeniylissin Oct 3, 2023
ee4e121
Merge pull request #1564 from irls/0.164-ILM-6139
evgeniylissin Oct 4, 2023
035fd7b
Merge pull request #1565 from irls/0.164-ILM-6139
evgeniylissin Oct 4, 2023
e91a6bd
Merge pull request #1566 from irls/0.164-ILM-6172
evgeniylissin Oct 9, 2023
0a88189
Merge pull request #1567 from irls/0.164-ILM-6172
evgeniylissin Oct 10, 2023
c5e9e59
Merge pull request #1568 from irls/0.164-ILM-6172
evgeniylissin Oct 11, 2023
03b633f
Merge pull request #1569 from irls/0.164-ILM-6172
evgeniylissin Oct 12, 2023
56c28e1
Merge pull request #1570 from irls/0.164-ILM-6172
evgeniylissin Oct 12, 2023
9fcd867
Merge pull request #1571 from irls/0.164-ILM-6172
evgeniylissin Oct 12, 2023
6d88ede
Merge pull request #1572 from irls/0.164-ILM-6172
evgeniylissin Oct 13, 2023
d6bb904
Merge pull request #1573 from irls/0.164-ILM-6172
evgeniylissin Oct 13, 2023
20cf7a8
Merge pull request #1575 from irls/0.164-ILM-6221
evgeniylissin Oct 18, 2023
ff334a8
Merge pull request #1576 from irls/0.163-ILM-6101
evgeniylissin Oct 18, 2023
96998d4
Merge branch '0.164-ILM-6202' into dev
evgeniylissin Oct 18, 2023
338fe9b
Merge branch '0.164-ILM-6126-publish-2-categories' into dev
Oct 18, 2023
2fe418d
Merge pull request #1578 from irls/0.164-ILM-6176
evgeniylissin Oct 18, 2023
bf0f782
Merge branch '0.164-ILM-6176' into dev
evgeniylissin Oct 19, 2023
8447ce4
Merge pull request #1579 from irls/0.163-ILM-5666
evgeniylissin Oct 19, 2023
976e646
Merge pull request #1580 from irls/0.164-ILM-6096
evgeniylissin Oct 19, 2023
bdd6947
Merge branch '0.164-ILM-6196-locked-warning' into dev
Oct 20, 2023
56a80ca
Merge pull request #1581 from irls/0.164-ILM-6172
evgeniylissin Oct 23, 2023
401523b
Merge branch '0.164-ILM-6176' into dev
evgeniylissin Oct 23, 2023
37c169a
Merge pull request #1582 from irls/0.164-ILM-6176-popup
evgeniylissin Oct 23, 2023
f57cf80
Merge pull request #1583 from irls/0.164-ILM-6176
evgeniylissin Oct 23, 2023
2a3f1ab
Merge pull request #1584 from irls/0.164-ILM-6216
evgeniylissin Oct 24, 2023
6f4eae8
Merge branch '0.164-ILM-6196-locked-warning' into dev
Oct 26, 2023
c1ec41b
Merge branch '0.164-ILM-6196-locked-warning' into dev
Oct 27, 2023
5336ec7
Merge pull request #1586 from irls/0.164-ILM-6199
evgeniylissin Oct 31, 2023
bf892c8
Merge pull request #1587 from irls/0.164-ILM-6280
evgeniylissin Oct 31, 2023
0b2f0c1
Merge pull request #1588 from irls/0.164-ILM-6176-popup
evgeniylissin Oct 31, 2023
35de50f
Merge branch '0.164-ILM-6126-publish-2-categories' into dev
Oct 31, 2023
c2f8d6f
Merge pull request #1589 from irls/0.164-ILM-6172
evgeniylissin Nov 1, 2023
20a1d09
Merge branch '0.164-ILM-6126-publish-2-categories' into dev
Nov 1, 2023
f9ef0c7
Merge branch '0.164-ILM-6126-publish-2-categories' into dev
Nov 1, 2023
2117592
Merge branch '0.164-ILM-6126-publish-2-categories' into dev
Nov 2, 2023
b6e4bc2
Merge branch '0.164-ILM-6126-publish-2-categories' into dev
mirashAK Nov 3, 2023
c6fc972
Bump axios from 0.24.0 to 1.6.0
dependabot[bot] Nov 10, 2023
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
832 changes: 455 additions & 377 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
},
"dependencies": {
"axios": "^0.24.0",
"axios": "^1.6.0",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"draggable": "4.1.2",
"draggable-list": "1.4.0",
Expand Down
236 changes: 199 additions & 37 deletions src/components/AudioEditor.vue

Large diffs are not rendered by default.

24 changes: 23 additions & 1 deletion src/components/audio/AudioImport.vue
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,21 @@ export default {
if (this.saveDisabled) {
return '';
}
let addedFiles = this.$refs.uploadDropzone.getQueuedFiles();
if (addedFiles && addedFiles.length > 0) {
addedFiles.forEach(file => {
if (file.size === 0) {
this.$refs.uploadDropzone.removeFile(file);
}
});
}
this.audiobook.report = "";
this.uploadFinished = false;
this.isUploading = true;
if (this.$refs.uploadDropzone.getQueuedFiles().length === 0 && !this.audioURL) {
this.closeForm();
return;
}
this.$store.commit('set_updateAudiobookProgress', true);
if (this.audioFiles.length === 0 && this.audioURL) {
this.onUploadFinished();
Expand Down Expand Up @@ -572,7 +584,9 @@ export default {
return uploadPromise
.then(response => {
if (response.status===200) {
this.uploadFinished = true
if (this.type !== 'parse_replace') {
this.uploadFinished = true
}
this.uploadErrors = [];
if (response.data.audio && typeof response.data.audio._id !== 'undefined') {
this.uploadProgress = response.data.newFilesCount + " Audiofiles processing"
Expand Down Expand Up @@ -746,6 +760,14 @@ export default {
}
}
}
},
'audiobook.updatedAt': {
handler(val) {
//console.log('updatedAt', this.audiobook.report)
if (this.type === 'parse_replace' && this.audiobook.report && this.audiobook.report.length) {
this.uploadFinished = true;
}
}
}
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/components/books/BookBlockView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2940,12 +2940,13 @@ Save text changes and realign the Block?`,
this.block.footnotes[pos] = new FootNote(this.block.footnotes[pos]);
}
let isPasteEvent = ev.relatedTarget && ev.relatedTarget.id && ev.relatedTarget.id.indexOf('medium-editor-pastebin') === 0;
let isRedactor = ev.relatedTarget && ev.relatedTarget.classList && ev.relatedTarget.classList.contains('medium-editor-action');
if (field && ev && ev.target) {
if (typeof ev.target.value !== 'undefined') {
if (this.block.footnotes[pos] && this.block.footnotes[pos].hasAttribute(field)) {
this.block.footnotes[pos][field] = ev.target.value;
}
} else if (field === 'content' && !isPasteEvent) {
} else if (field === 'content' && !isPasteEvent && !isRedactor) {
this.block.footnotes[pos][field] = ev.target.innerHTML;
}
}
Expand Down Expand Up @@ -3020,6 +3021,9 @@ Save text changes and realign the Block?`,
if (!this.checkAllowNarrateUnassigned()) {
return false;
}
if (this.mode === 'narrate' && this.block && this.block.voicework !== 'narration') {
return false;
}
if (this.allowBlockFlag) {
if (this.block && this.block.voicework === 'narration') {
if (type === 'editor' && this.mode === 'edit') {
Expand Down Expand Up @@ -4548,6 +4552,9 @@ Save text changes and realign the Block?`,
this.voiceworkUpdateType = 'single';
}
});
},
hideChangeVoiceworkModal() {
this.$root.$emit('voicework-update-finished');
}
},
watch: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/books/BookEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2591,7 +2591,7 @@ export default {
if (this.$refs.blocks && this.$refs.blocks.length) {
this.$refs.blocks[0].voiceworkUpdating = false;
this.$refs.blocks[0].voiceworkBlockType = false;
this.$refs.blocks[0].hideModal('voicework-change');
this.$refs.blocks[0].hideChangeVoiceworkModal();
} else {
this.$store.state.liveDB.onBookReimport();
this.$store.state.liveDB.stopWatch('metaV');
Expand Down
Loading