Skip to content
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
86fa8ed
Added event listener to paste as plain text
lukemelong Jan 27, 2022
9ceed69
Refactored getElementById to $ref
lukemelong Jan 31, 2022
fdcf62a
Merge pull request #48 from SpringRoll/bugfix/paste-rich-content-as-p…
lukemelong Feb 2, 2022
efc787a
Merge pull request #65 from SpringRoll/main
lukemelong Mar 28, 2022
99df7cf
Added nvrmc file
lukemelong Mar 28, 2022
5c7127a
Added tool-versions file for asdf
lukemelong Apr 12, 2022
d858df0
Updated readme for asdf
lukemelong Apr 12, 2022
cf5e522
Merge pull request #66 from SpringRoll/chore/181657296-add-nvrmc-file
lukemelong Apr 13, 2022
8dfdd84
electron bump, removed overrides, runs at node 14+
TensAndTwenties Jun 22, 2022
bf16dfa
removing context isolation false for security
TensAndTwenties Jun 22, 2022
814d408
remove promises ref
TensAndTwenties Jun 22, 2022
de24c2b
Upgrading test runner to node 14.x
TensAndTwenties Jun 22, 2022
86c7834
uppdate node version and fix changelog
902seanryan Jun 23, 2022
2b258ef
fix the right yml file
902seanryan Jun 23, 2022
012f21a
Changes to window attributes, eliminated warnings, fixed errors relat…
TensAndTwenties Jun 24, 2022
8639386
fix check for same index in JSONPreview
902seanryan Jul 5, 2022
d8d1487
fix packages so app builds properly
902seanryan Jul 6, 2022
e0a3f77
update changelog
902seanryan Jul 6, 2022
154242e
includes karma dependancies
TensAndTwenties Jul 6, 2022
8f2bda4
Merge branch 'feature/181680466-upgrade-electron' of https://github.c…
TensAndTwenties Jul 6, 2022
0f623c3
removed plugins, specified test folders, one still left out
TensAndTwenties Jul 7, 2022
585447e
All automated tests pass, just not together at once
TensAndTwenties Oct 18, 2022
ba487b5
tests running linearly but with lots of printout
TensAndTwenties Nov 1, 2022
8f10028
New testing process for captionStudio
TensAndTwenties Nov 4, 2022
651905f
changelog update
TensAndTwenties Nov 4, 2022
5feca5b
minor changelog change
TensAndTwenties Nov 7, 2022
d1273b7
Merge pull request #69 from SpringRoll/feature/181680466-upgrade-elec…
TensAndTwenties Nov 7, 2022
462ff1a
Merge branch 'develop' into bugfix/caption-studio-file-changing
902seanryan Nov 25, 2022
7a639a7
remove old override
902seanryan Nov 25, 2022
77e3ba4
update package lock
902seanryan Nov 25, 2022
5103bac
try re-updating package lock
902seanryan Nov 25, 2022
b2eee58
Merge pull request #70 from SpringRoll/bugfix/caption-studio-file-cha…
902seanryan Dec 1, 2022
976e02b
changed version release date
TensAndTwenties Dec 2, 2022
1efc13c
fixing typo in changelog
TensAndTwenties Dec 2, 2022
62601f4
removed comments, changed nodeIntegration value
TensAndTwenties Dec 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
node-version: [10.x]
node-version: [16.x]

steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/full-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
node-version: [10.x]
node-version: [16.x]

steps:
- uses: actions/checkout@v1
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.14.2
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 16.14.2
28 changes: 24 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,51 @@
# Changelog

All notable changes to this project will be documented in this file.

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

## [1.1.1] - unreleased
- Upgraded follow-redirects dependancy for security alert
## [1.2.0] - 2022-12-02

### Changed

- Upgraded follow-redirects dependency for security alert
- Bumped Node version for tests to 16.x
- Bumped electron version
- Fixed unit test errors
- Created new testing process for CaptionStudio

### Fixed

- fixed bug when selecting a caption that caused the new audio file to not be selected and loaded into the wave form

## [1.1.0] - 2021-08-16

### Added

- JSON Editor mode switch. Allows toggling between 'code' and 'form' modes, for better usability.

### Fixed

- Overflow: scroll causing 3-4 scroll bar regions to show up when unecessary
- Fixed styles for caption preview next/previous buttons so they properly show up side by side

## [1.0.0] - 2020-03-31

### Added

- Unit tests added for caption studio components and classes

### Changed

- Caption Studio now reads audio files directly from project root, or user specified audio directory
- Caption studio now allows for saving/opening caption JSON files directly from projects

### Added

- This CHANGELOG

- VUE front end renderer
- Electron back end
- Project Templating via Github or bundled seed projects
- Caption Studio Initial Implementation


11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ Caption Studio is designed to help you in creating audio caption files (JSON for
###

## Project setup
For `nvm`:
```
nvm use
```

For `asdf`:
```
asdf install nodejs
```

Then
```
npm install
```
Expand Down
3 changes: 2 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
],
plugins: ['@babel/plugin-proposal-optional-chaining']
};
Loading