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

Merge branch 'master' into mpegts-streamer

This commit is contained in:
0xboobface 2018-09-07 17:24:36 +02:00
parent cda1f25dc0 4054ceed96
commit 7f881504a6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,8 +1,14 @@
1.5.0
========================
1.4.3 1.4.3
======================== ========================
* Added possibility to switch the video resolution for a recording * Added possibility to switch the video resolution for a recording
* Added selection box below the overview pages to change the thumbnail size * Added selection box below the overview pages to change the thumbnail size
* Save and restore window size, location and maximized state * Save and restore window size, location and maximized state
* Added check for OpenJDK and JavaFX on start to print out a better error,
if JavaFX is not available
1.4.2 1.4.2
======================== ========================

6
docs/index.html
View File

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

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>ctbrec</groupId> <groupId>ctbrec</groupId>
<artifactId>ctbrec</artifactId> <artifactId>ctbrec</artifactId>
<version>1.4.3-SNAPSHOT</version> <version>1.5.0-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>