Skip to content

Commit

Permalink
Merge branch 'release/1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
julianpoemp committed Jan 23, 2018
2 parents 68efcc3 + 9ce24f4 commit f452274
Show file tree
Hide file tree
Showing 154 changed files with 1,365 additions and 1,115 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -399,3 +399,4 @@ xcuserdata/
/dist/config/appconfig.json
/bd.sh
/bp.sh
/bdeploy.sh
32 changes: 14 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,38 @@
# Change Log

## [v1.2.3](https://github.com/IPS-LMU/octra/tree/v1.2.3) (2018-01-23)

[Full Changelog](https://github.com/IPS-LMU/octra/compare/v1.2.2...v1.2.3)

**Implemented enhancements:**

- allow importing audio files via URL [\#78](https://github.com/IPS-LMU/octra/issues/78)

**Fixed bugs:**

- 2D-Editor: Drawing Segments does not work correctly [\#85](https://github.com/IPS-LMU/octra/issues/85)
- Local mode: DragnDrop: Audio file not decoded automatically [\#84](https://github.com/IPS-LMU/octra/issues/84)
- PartiturConverter: OCTRA can't find header data by different ordering [\#83](https://github.com/IPS-LMU/octra/issues/83)

## [v1.2.2](https://github.com/IPS-LMU/octra/tree/v1.2.2) (2017-11-19)
[Full Changelog](https://github.com/IPS-LMU/octra/compare/v1.2.1...v1.2.2)

**Implemented enhancements:**

- 2D-Editor: circle loupe should follow the mouse cursor more fluently [\#82](https://github.com/IPS-LMU/octra/issues/82)
- new option: Enable/Disable rounded loupe [\#80](https://github.com/IPS-LMU/octra/issues/80)
- Import and export of BASPartitur files
- changed shortcut for "set break" action from 'P' to 'A'
- tier selection for specific files before export
- perfomance and stability improvements

**Fixed bugs:**

- OCTRA crashes using the local mode and very large audio files [\#79](https://github.com/IPS-LMU/octra/issues/79)
- 2D-editor: fixed scrollbar bug
- fixed clone bug in multi-tiers selection

**Merged pull requests:**

- Create CODE\_OF\_CONDUCT.md [\#81](https://github.com/IPS-LMU/octra/pull/81) ([julianpoemp](https://github.com/julianpoemp))

**Thanks to:**
- Riccarda Funk (feedback, bug report)
- P.Pavlitschek (feedback, bug report)

## [v1.2.1](https://github.com/IPS-LMU/octra/tree/v1.2.1) (2017-10-23)
[Full Changelog](https://github.com/IPS-LMU/octra/compare/1.2.0...v1.2.1)

**Implemented enhancements:**

- audioviewer: use web worker to compute display data, improved algorithms
- 2D-Editor: improved performance and stability
- Linear Editor: improved performance and stability
- Login GUI: improved the way to switch between the local and online mode
- Help Tools: OCTRA-URL/help-tools allows to easily remove data or (hard) reload OCTRA

**Fixed bugs:**

- audioviewer does not draw any signal in some cases [\#63](https://github.com/IPS-LMU/octra/issues/63)
Expand Down
12 changes: 6 additions & 6 deletions dist/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[email protected].1
[email protected].3
MIT
Copyright (c) 2014-2017 Denis Pushkarev

Expand Down Expand Up @@ -88,7 +88,7 @@ Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United
States and other countries. All third party trademarks referenced herein are
the property of their respective owners.

[email protected].18
[email protected].19
MIT
The MIT License

Expand All @@ -112,7 +112,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

webpack@3.8.1
webpack@3.10.0
MIT
Copyright JS Foundation and other contributors

Expand All @@ -135,7 +135,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@angular/core@5.0.1
@angular/core@5.1.3
MIT
MIT

Expand All @@ -149,7 +149,7 @@ Permission to use, copy, modify, and/or distribute this software for any purpose

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

node-libs-browser@2.0.0
node-libs-browser@2.1.0
MIT
(The MIT License)

Expand All @@ -174,7 +174,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@angular/common@5.0.1
@angular/common@5.1.3
MIT
MIT

Expand Down
6 changes: 3 additions & 3 deletions dist/config/localmode/guidelines/guidelines_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
"examples": [
{
"annotation": "20: zwanzig",
"url": ""
"url":""
},
{
"annotation": "1991: neunzehn hundert und einundzeunzig",
"url": ""
"url":""
}
]
},
Expand All @@ -45,7 +45,7 @@
"examples": [
{
"annotation": "A B B ß: A doppel B scharfes S",
"url": ""
"url":""
},
{
"annotation": "D: /D/",
Expand Down
5 changes: 3 additions & 2 deletions dist/i18n/octra/octra_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@
"id": "ID",
"download": "Download",
"application": "Anwendung",
"website": "Webseite",
"website" : "Webseite",
"news": "Neuigkeiten",
"faq": "FAQ",
"features": "Features",
"transcription window": "Transkriptionsfenster",
"supported files": "Unterstützte Dateien",
"select one tier": "Einen Tier auswählen"
"select one tier": "Einen Tier auswählen",
"prompt": "Textvorlage"
},
"bug report": {
"report an error": "Fehler melden",
Expand Down
5 changes: 3 additions & 2 deletions dist/i18n/octra/octra_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"no errors found": "No errors found",
"segment": "Segment",
"job number": "Job number",
"free jobs": "free Jobs",
"free jobs": "Free Jobs",
"email": "Email",
"description": "Description",
"bug report": "Bug Report",
Expand All @@ -69,7 +69,8 @@
"features": "Features",
"transcription window": "Transcription window",
"supported files": "Supported files",
"select one tier": "Select one tier"
"select one tier": "Select one tier",
"prompt": "Prompt"
},
"bug report": {
"report an error": "Report an error",
Expand Down
153 changes: 54 additions & 99 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,102 +1,57 @@
<!DOCTYPE html>
<html lang="en">
<head>
<base href="https://www.phonetik.uni-muenchen.de/apps/octra/octra/">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Expires" content="0">
<link rel="shortcut icon" type="image/x-icon" href="assets/img/default/favicon.ico">
<title>OCTRA - Orthographic transcription</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<!-- Place this data between the <head> tags of your website -->
<meta name="description" content="OCTRA is a modern online tool for the orthographic transcription of audio files.
<!DOCTYPE html><html lang="en"><head><base href="https://www.phonetik.uni-muenchen.de/apps/octra/octra/"><meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"><meta http-equiv="Pragma" content="no-cache"><meta http-equiv="Expires" content="0"><link rel="shortcut icon" type="image/x-icon" href="assets/img/default/favicon.ico"><title>OCTRA - Orthographic transcription</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!-- Place this data between the <head> tags of your website --><meta name="description" content="OCTRA is a modern online tool for the orthographic transcription of audio files.
It can be used online or local and is free to use. What makes it special is its user-friendly appearance and its features:
multiple editors and tiers, auto-saving, transcription guidelines support of various file formats and a lot more."/>
<!-- Twitter Card data -->
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="OCTRA - Modern web-application for the othographic transcription">
<meta name="twitter:description" content="OCTRA is a modern online tool for the orthographic transcription of audio files.
multiple editors and tiers, auto-saving, transcription guidelines support of various file formats and a lot more."/><!-- Twitter Card data --><meta name="twitter:card" content="summary"><meta name="twitter:title" content="OCTRA - Modern web-application for the othographic transcription"><meta name="twitter:description" content="OCTRA is a modern online tool for the orthographic transcription of audio files.
It can be used online or local and is free to use. What makes it special is its user-friendly appearance and its features:
multiple editors and tiers, auto-saving, transcription guidelines support of various file formats and a lot more.">
<meta name="twitter:image"
content="https://www.phonetik.uni-muenchen.de/apps/octra/octra/assets/img/socialmedia/octra_logo_twitter.jpg">
<!-- Open Graph data -->
<meta property="og:title" content="OCTRA - Modern web-application for the othographic transcription"/>
<meta property="og:type" content="article"/>
<meta property="og:url" content="https://www.phonetik.uni-muenchen.de/apps/octra/octra/features"/>
<meta property="og:image"
content="https://www.phonetik.uni-muenchen.de/apps/octra/octra/assets/img/socialmedia/octra_logo_fb.jpg"/>
<meta property="og:description" content="OCTRA is a modern online tool for the orthographic transcription of audio files.
multiple editors and tiers, auto-saving, transcription guidelines support of various file formats and a lot more."><meta name="twitter:image" content="https://www.phonetik.uni-muenchen.de/apps/octra/octra/assets/img/socialmedia/octra_logo_twitter.jpg"><!-- Open Graph data --><meta property="og:title" content="OCTRA - Modern web-application for the othographic transcription"/><meta property="og:type" content="article"/><meta property="og:url" content="https://www.phonetik.uni-muenchen.de/apps/octra/octra/features"/><meta property="og:image" content="https://www.phonetik.uni-muenchen.de/apps/octra/octra/assets/img/socialmedia/octra_logo_fb.jpg"/><meta property="og:description" content="OCTRA is a modern online tool for the orthographic transcription of audio files.
It can be used online or local and is free to use. What makes it special is its user-friendly appearance and its features:
multiple editors and tiers, auto-saving, transcription guidelines support of various file formats and a lot more."/>
<style>#logo {
text-align: center;
width: 100%;
display: block;
font-size: 4em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300;
}

/* copy from bootstrap-material */
.progress {
height: 4px;
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
background: #c8c8c8;
}

.progress .progress-bar {
-webkit-box-shadow: none;
box-shadow: none;
}

.progress .progress-bar,
.progress .progress-bar.progress-bar-default {
background-color: #009688;
}

.progress .progress-bar.progress-bar-inverse {
background-color: #3f51b5;
}

.progress .progress-bar.progress-bar-primary {
background-color: #009688;
}

.progress .progress-bar.progress-bar-success {
background-color: #4caf50;
}

.progress .progress-bar.progress-bar-info {
background-color: #03a9f4;
}

.progress .progress-bar.progress-bar-warning {
background-color: #ff5722;
}

.progress .progress-bar.progress-bar-danger {
background-color: #f44336;
}</style>
<link href="styles.5cebd0b1af815cdbdb41.bundle.css" rel="stylesheet"/>
</head><!-- 3. Display the application -->
<body>
<app-octra>
<div id="loading" style="margin-top:10%;padding:20px"><span id="logo">OCTRA</span>
<div class="progress">
<div class="progress-bar progress-animated" style="width:100%"></div>
</div>
<div class="description" style="margin-top:20px;text-align:center">Please wait... OCTRA is loading...</div>
<noscript><p style="text-align:center;color:red">You need Javascript to use this Web-application</p></noscript>
</div>
</app-octra>
<script type="text/javascript" src="inline.420d982442403d6028a9.bundle.js"></script>
<script type="text/javascript" src="polyfills.1bff508e17c3b132bb4e.bundle.js"></script>
<script type="text/javascript" src="scripts.3c9cbb7f93357bc30437.bundle.js"></script>
<script type="text/javascript" src="main.90fcd16b986250663d07.bundle.js"></script>
</body>
</html>
multiple editors and tiers, auto-saving, transcription guidelines support of various file formats and a lot more."/><style>#logo {
text-align: center;
width: 100%;
display: block;
font-size: 4em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 300;
}

/* copy from bootstrap-material */
.progress {
height: 4px;
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
background: #c8c8c8;
}

.progress .progress-bar {
-webkit-box-shadow: none;
box-shadow: none;
}

.progress .progress-bar,
.progress .progress-bar.progress-bar-default {
background-color: #009688;
}

.progress .progress-bar.progress-bar-inverse {
background-color: #3f51b5;
}

.progress .progress-bar.progress-bar-primary {
background-color: #009688;
}

.progress .progress-bar.progress-bar-success {
background-color: #4caf50;
}

.progress .progress-bar.progress-bar-info {
background-color: #03a9f4;
}

.progress .progress-bar.progress-bar-warning {
background-color: #ff5722;
}

.progress .progress-bar.progress-bar-danger {
background-color: #f44336;
}</style><link href="styles.65d0214762c93197ee0b.bundle.css" rel="stylesheet"/></head><!-- 3. Display the application --><body><app-octra><div id="loading" style="margin-top:10%;padding:20px;"><span id="logo">OCTRA</span><div class="progress"><div class="progress-bar progress-animated" style="width:100%"></div></div><div class="description" style="margin-top:20px;text-align:center;">Please wait... OCTRA is loading...</div><noscript><p style="text-align:center;color:red">You need Javascript to use this Web-application</p></noscript></div></app-octra><script type="text/javascript" src="inline.1a35f72286ff6d6e1763.bundle.js"></script><script type="text/javascript" src="polyfills.e13c18b7efd454bbfdcf.bundle.js"></script><script type="text/javascript" src="scripts.bf23de9c482ed8475688.bundle.js"></script><script type="text/javascript" src="main.95022f03186150d40b28.bundle.js"></script></body></html>
1 change: 1 addition & 0 deletions dist/inline.1a35f72286ff6d6e1763.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion dist/inline.420d982442403d6028a9.bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/main.90fcd16b986250663d07.bundle.js

This file was deleted.

1 change: 1 addition & 0 deletions dist/main.95022f03186150d40b28.bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/polyfills.1bff508e17c3b132bb4e.bundle.js

This file was deleted.

1 change: 1 addition & 0 deletions dist/polyfills.e13c18b7efd454bbfdcf.bundle.js

Large diffs are not rendered by default.

20 changes: 0 additions & 20 deletions dist/scripts.3c9cbb7f93357bc30437.bundle.js

This file was deleted.

1 change: 1 addition & 0 deletions dist/scripts.bf23de9c482ed8475688.bundle.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file removed dist/summernote.608fd10666a860567740.woff
Binary file not shown.
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,18 @@
"ngx-bootstrap": "^1.9.1",
"ngx-webstorage": "^2.0.0",
"platform": "^1.3.4",
"rxjs": "^5.5.2",
"summernote": "^0.8.8",
"typescript": "^2.4.2",
"rxjs": "5.5.2",
"summernote": "0.8.8",
"typescript": "2.4.2",
"video.js": "^5.18.4",
"web-animations-js": "^2.2.2",
"x2js": "^3.1.1",
"zone.js": "^0.8.16"
},
"devDependencies": {
"@angular/cli": "^1.5.0",
"@angular/compiler-cli": "^5.0.0",
"@angular/language-service": "^5.0.0",
"@angular/language-service": "^5.0.5",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
Expand All @@ -65,6 +66,6 @@
"protractor": "~5.1.2",
"ts-node": "~3.2.0",
"tslint": "~5.7.0",
"typescript": "~2.4.2"
"typescript": "2.4.2"
}
}
Loading

0 comments on commit f452274

Please sign in to comment.