Skip to content

Commit d1273b7

Browse files
Merge pull request #69 from SpringRoll/feature/181680466-upgrade-electron
Upgrade electron
2 parents cf5e522 + 5feca5b commit d1273b7

File tree

15 files changed

+12294
-6494
lines changed

15 files changed

+12294
-6494
lines changed

.github/workflows/build-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node-version: [10.x]
14+
node-version: [16.x]
1515

1616
steps:
1717
- uses: actions/checkout@v1

.github/workflows/full-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
node-version: [10.x]
14+
node-version: [16.x]
1515

1616
steps:
1717
- uses: actions/checkout@v1

CHANGELOG.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,46 @@
11
# Changelog
2+
23
All notable changes to this project will be documented in this file.
34

45
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
56
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
67

7-
## [1.1.1] - unreleased
8+
## [1.2.0] - unreleased
9+
10+
### Changed
11+
812
- Upgraded follow-redirects dependancy for security alert
13+
- Bumped Node version for tests to 16.x
14+
- Bumped electron version
15+
- Fixed unit test errors
16+
- Created new testing process for CaptionStudio
917

1018
## [1.1.0] - 2021-08-16
19+
1120
### Added
21+
1222
- JSON Editor mode switch. Allows toggling between 'code' and 'form' modes, for better usability.
23+
1324
### Fixed
25+
1426
- Overflow: scroll causing 3-4 scroll bar regions to show up when unecessary
1527
- Fixed styles for caption preview next/previous buttons so they properly show up side by side
1628

1729
## [1.0.0] - 2020-03-31
30+
1831
### Added
32+
1933
- Unit tests added for caption studio components and classes
2034

2135
### Changed
36+
2237
- Caption Studio now reads audio files directly from project root, or user specified audio directory
2338
- Caption studio now allows for saving/opening caption JSON files directly from projects
39+
2440
### Added
41+
2542
- This CHANGELOG
2643
- VUE front end renderer
2744
- Electron back end
2845
- Project Templating via Github or bundled seed projects
2946
- Caption Studio Initial Implementation
30-
31-

babel.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module.exports = {
22
presets: [
33
'@vue/cli-plugin-babel/preset'
4-
]
4+
],
5+
plugins: ['@babel/plugin-proposal-optional-chaining']
56
};

0 commit comments

Comments
 (0)