j62
/
ctbrec
2
2
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'master' into notify

This commit is contained in:
0xboobface 2018-11-28 23:43:43 +01:00
parent 4150a2911b c73bdda35d
commit cf9a6d3f85
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,7 @@
1.12.1
========================
* Fixed downloads in client / server mode
1.12.0
========================
* Added threshold setting to keep free space on the recording device.
@ -138,4 +142,4 @@
* Added proxy settings
* Made playlist generator more robust
* Fixed some issues with the file merging
* Fixed memory leak caused by the model filter function
* Fixed memory leak caused by the model filter function

2
client/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>1.12.0</version>
<version>1.12.1</version>
<relativePath>../master</relativePath>
</parent>

2
common/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>1.12.0</version>
<version>1.12.1</version>
<relativePath>../master</relativePath>
</parent>

6
docs/index.html
View File

@ -118,19 +118,19 @@
</script>
<div class="row text-center">
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.12.0/ctbrec-1.12.0-win64-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.12.1/ctbrec-1.12.1-win64-jre.zip');">
<i class="fa fa-windows mr-2"></i>
Download for Windows!
</a>
</div>
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.12.0/ctbrec-1.12.0-macos-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.12.1/ctbrec-1.12.1-macos-jre.zip');">
<i class="fa fa-apple mr-2"></i>
Download for macOS!
</a>
</div>
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.12.0/ctbrec-1.12.0-linux-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.12.1/ctbrec-1.12.1-linux-jre.zip');">
<i class="fa fa-linux mr-2"></i>
Download for Linux!
</a>

2
master/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<packaging>pom</packaging>
<version>1.12.0</version>
<version>1.12.1</version>
<modules>
<module>../common</module>

2
server/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ctbrec</groupId>
<artifactId>master</artifactId>
<version>1.12.0</version>
<version>1.12.1</version>
<relativePath>../master</relativePath>
</parent>