diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f7b9c82..7a97277d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +4.7.2 +======================== +Fixed Camsoda recordings (thx @Ban) (vor 3 Tagen 0xb00bface) +Fixed Camsoda followed tab +Fixed MVLive tab +Fixed LiveJasmin Followed tab +Fixed Cherry.TV overview pages +Fixed thumbnails in Camsoda search results +Updated minimal browser to electron 17.0.1 + 4.7.1 ======================== * Fix: model groups not exported from server but from local config diff --git a/client/pom.xml b/client/pom.xml index b9cef135..a014cc7b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -1,258 +1,258 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 - client + 4.0.0 + client - - ctbrec - master - 4.7.1 - ../master - + + ctbrec + master + 4.7.2 + ../master + - - ${project.groupId}-${project.version} - + + ${project.groupId}-${project.version} + - - - - src/main/resources - false - - - src/main/java - false - - **/*.css - - - - src/main/resources - true - - version - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - src/main/resources/META-INF/MANIFEST.MF - - true - lib/ - - - - - - + + + + src/main/resources + false + + + src/main/java + false + + **/*.css + + + + src/main/resources + true + + version + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + true + lib/ + + + + + + - - - ctbrec - common - - - ch.qos.logback - logback-classic - compile - - - org.openjfx - javafx-controls - - - org.openjfx - javafx-media - - - org.openjfx - javafx-swing - - - org.eclipse.jetty - jetty-servlet - - - com.vladsch.flexmark - flexmark - 0.40.34 - - + + + ctbrec + common + + + ch.qos.logback + logback-classic + compile + + + org.openjfx + javafx-controls + + + org.openjfx + javafx-media + + + org.openjfx + javafx-swing + + + org.eclipse.jetty + jetty-servlet + + + com.vladsch.flexmark + flexmark + 0.40.34 + + - - - win - - - javafx.platform - win - - - - - - com.akathist.maven.plugins.launch4j - launch4j-maven-plugin - 2.1.1 - - - l4j-win - package - - launch4j - - - gui - target/ctbrec.exe - ${name.final}.jar - true - src/main/resources/icon.ico - ctbrec - - ctbrec.ui.Launcher - true - lib/ - . - - https://jdk.java.net/ - - jre - true - 15 - 512 - - -Dfile.encoding=utf-8 - - - - 4.0.0.0 - 4.0.0.0 - Software to record live streams - 2021 0xb00bface - 4.0.0.0 - 4.0.0.0 - CTB Recorder - ctbrec - ctbrec.exe - - - src/main/resources/splash.bmp - true - 60 - true - - - - - - - maven-assembly-plugin - 3.1.0 - - - zip - verify - - single - - - ctbrec-${project.version} - - src/assembly/win64-jre.xml - - - - - - - - - - linux - - - javafx.platform - linux - - - - - - maven-assembly-plugin - 3.1.0 - - - zip - verify - - single - - - ctbrec-${project.version} - - src/assembly/linux-jre.xml - - - - - - - - - - macos - - - javafx.platform - mac - - - - - - - maven-assembly-plugin - 3.1.0 - - - zip - verify - - single - - - ctbrec-${project.version} - - src/assembly/macos-jre.xml - - - - - - - - - + + + win + + + javafx.platform + win + + + + + + com.akathist.maven.plugins.launch4j + launch4j-maven-plugin + 2.1.1 + + + l4j-win + package + + launch4j + + + gui + target/ctbrec.exe + ${name.final}.jar + true + src/main/resources/icon.ico + ctbrec + + ctbrec.ui.Launcher + true + lib/ + . + + https://jdk.java.net/ + + jre + true + 15 + 512 + + -Dfile.encoding=utf-8 + + + + 4.0.0.0 + 4.0.0.0 + Software to record live streams + 2021 0xb00bface + 4.0.0.0 + 4.0.0.0 + CTB Recorder + ctbrec + ctbrec.exe + + + src/main/resources/splash.bmp + true + 60 + true + + + + + + + maven-assembly-plugin + 3.1.0 + + + zip + verify + + single + + + ctbrec-${project.version} + + src/assembly/win64-jre.xml + + + + + + + + + + linux + + + javafx.platform + linux + + + + + + maven-assembly-plugin + 3.1.0 + + + zip + verify + + single + + + ctbrec-${project.version} + + src/assembly/linux-jre.xml + + + + + + + + + + macos + + + javafx.platform + mac + + + + + + + maven-assembly-plugin + 3.1.0 + + + zip + verify + + single + + + ctbrec-${project.version} + + src/assembly/macos-jre.xml + + + + + + + + + diff --git a/common/pom.xml b/common/pom.xml index a61dea6a..adf27134 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,67 +1,67 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 - common + 4.0.0 + common - - ctbrec - master - 4.7.1 - ../master - + + ctbrec + master + 4.7.2 + ../master + - - - org.slf4j - slf4j-api - - - org.jsoup - jsoup - - - com.squareup.okhttp3 - okhttp - - - com.squareup.moshi - moshi - - - org.json - json - - - com.iheartradio.m3u8 - open-m3u8 - - - com.google.guava - guava - - - commons-io - commons-io - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - javax.xml.bind - jaxb-api - 2.3.1 - - - org.glassfish.jaxb - jaxb-runtime - 2.3.1 - runtime - - + + + org.slf4j + slf4j-api + + + org.jsoup + jsoup + + + com.squareup.okhttp3 + okhttp + + + com.squareup.moshi + moshi + + + org.json + json + + + com.iheartradio.m3u8 + open-m3u8 + + + com.google.guava + guava + + + commons-io + commons-io + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + javax.xml.bind + jaxb-api + 2.3.1 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.1 + runtime + + diff --git a/master/pom.xml b/master/pom.xml index 03b5efa0..e38db8ba 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -1,180 +1,180 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 - ctbrec - master - pom - 4.7.1 + 4.0.0 + ctbrec + master + pom + 4.7.2 - - ../common - ../server - ../client - + + ../common + ../server + ../client + - - UTF-8 - 16 - 16 - 17.0.1 - 5.7.2 - + + UTF-8 + 16 + 16 + 17.0.1 + 5.7.2 + - - - - - maven-jar-plugin - 2.4 - - - maven-assembly-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - true - - - - - - - maven-assembly-plugin - - - + + + + + maven-jar-plugin + 2.4 + + + maven-assembly-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + true + + + + + + + maven-assembly-plugin + + + - - - - ctbrec - common - ${project.version} - - - org.jsoup - jsoup - 1.14.3 - - - com.squareup.okhttp3 - okhttp - 4.9.3 - - - com.squareup.moshi - moshi - 1.13.0 - - - org.json - json - 20211205 - - - org.slf4j - slf4j-api - 1.7.32 - - - ch.qos.logback - logback-classic - 1.2.9 - runtime - - - com.iheartradio.m3u8 - open-m3u8 - 0.2.7-CTBREC - - - org.openjfx - javafx-controls - ${version.javafx} - - - org.openjfx - javafx-web - ${version.javafx} - - - org.openjfx - javafx-media - ${version.javafx} - - - org.openjfx - javafx-swing - ${version.javafx} - - - com.google.guava - guava - 31.0.1-jre - - - commons-io - commons-io - 2.11.0 - - - org.junit.jupiter - junit-jupiter-api - ${version.junit} - test - - - org.junit.jupiter - junit-jupiter-engine - ${version.junit} - test - - - org.mockito - mockito-inline - 3.11.0 - test - - - org.eclipse.jetty - jetty-server - [9.4.19.v20190610,9.99.99) - - - org.eclipse.jetty - jetty-servlet - [9.4.19.v20190610,9.99.99) - - - org.eclipse.jetty - jetty-rewrite - [9.4.19.v20190610,9.99.99) - - - + + + + ctbrec + common + ${project.version} + + + org.jsoup + jsoup + 1.14.3 + + + com.squareup.okhttp3 + okhttp + 4.9.3 + + + com.squareup.moshi + moshi + 1.13.0 + + + org.json + json + 20211205 + + + org.slf4j + slf4j-api + 1.7.32 + + + ch.qos.logback + logback-classic + 1.2.9 + runtime + + + com.iheartradio.m3u8 + open-m3u8 + 0.2.7-CTBREC + + + org.openjfx + javafx-controls + ${version.javafx} + + + org.openjfx + javafx-web + ${version.javafx} + + + org.openjfx + javafx-media + ${version.javafx} + + + org.openjfx + javafx-swing + ${version.javafx} + + + com.google.guava + guava + 31.0.1-jre + + + commons-io + commons-io + 2.11.0 + + + org.junit.jupiter + junit-jupiter-api + ${version.junit} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit} + test + + + org.mockito + mockito-inline + 3.11.0 + test + + + org.eclipse.jetty + jetty-server + [9.4.19.v20190610,9.99.99) + + + org.eclipse.jetty + jetty-servlet + [9.4.19.v20190610,9.99.99) + + + org.eclipse.jetty + jetty-rewrite + [9.4.19.v20190610,9.99.99) + + + - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-inline - test - - + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.mockito + mockito-inline + test + + diff --git a/server/pom.xml b/server/pom.xml index 223ed051..89463167 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,98 +1,98 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 - server + 4.0.0 + server - - ctbrec - master - 4.7.1 - ../master - + + ctbrec + master + 4.7.2 + ../master + - - ctbrec-server-${project.version}-final - + + ctbrec-server-${project.version}-final + - - - - src/main/resources - false - - - src/main/resources - true - - version - html/static/index.html - - - - - - maven-assembly-plugin - - - assembly - package - - single - - - ${name.final} - false - - jar-with-dependencies - - - - - zip - verify - - single - - - - src/assembly/server.xml - - - - - - - + + + + src/main/resources + false + + + src/main/resources + true + + version + html/static/index.html + + + + + + maven-assembly-plugin + + + assembly + package + + single + + + ${name.final} + false + + jar-with-dependencies + + + + + zip + verify + + single + + + + src/assembly/server.xml + + + + + + + - - - ctbrec - common - - - ch.qos.logback - logback-classic - runtime - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-rewrite - - - com.sun.activation - javax.activation - 1.2.0 - runtime - - + + + ctbrec + common + + + ch.qos.logback + logback-classic + runtime + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-rewrite + + + com.sun.activation + javax.activation + 1.2.0 + runtime + +