diff --git a/CHANGELOG.md b/CHANGELOG.md index f72934f0..1a7e0f4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ # Libresonic/libresonic # --> -v6.1.rc1 +v6.1.beta2 -------- * Metaproject: Jenkins builds! diff --git a/INSTALL.md b/INSTALL.md index b4dfcf15..40f97083 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -23,7 +23,7 @@ Daily WAR files are built by Jenkins and available [here](https://jenkins.zifnab 1. Download the latest war file: - wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.rc1/libresonic-main-6.1.rc1.war -O /var/lib/tomcat8/webapps/libresonic.war + wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.beta2/libresonic-main-6.1.beta2.war -O /var/lib/tomcat8/webapps/libresonic.war Note that this command copies the war file directly to the Tomcat webapps directory, and renames it to `libresonic.war`. diff --git a/documentation/FreeBSD-FreeNAS-Install.md b/documentation/FreeBSD-FreeNAS-Install.md index 5606cc96..0edaa6c2 100644 --- a/documentation/FreeBSD-FreeNAS-Install.md +++ b/documentation/FreeBSD-FreeNAS-Install.md @@ -66,15 +66,15 @@ Open a web browser and enter your servers IP address in the url bar followed by You should be greeted by the Apache Tomcat page. Click on the Manager App button on the right of the page and enter the username and password used in step 3. Default was username: admin and password: admin -Scroll down to Deploy and the subheading "WAR file to deploy" hit choose file and select the libresonic.war downloaded in the preamble. After selecting press the deploy button. Scroll up and press start. When the page refreshes a message "OK - Started application at context path /libresonic-v6.1.rc1" should be visible. +Scroll down to Deploy and the subheading "WAR file to deploy" hit choose file and select the libresonic.war downloaded in the preamble. After selecting press the deploy button. Scroll up and press start. When the page refreshes a message "OK - Started application at context path /libresonic-v6.1" should be visible. ### 6. Navigate to Libresonic In a browser. Take your server IP address and port and append the the context path from above -ie if the War deployed was called libresonic-v6.1.rc1.war navigate to: +ie if the War deployed was called libresonic-v6.1.war navigate to: - 10.0.0.10:8080/libresonic-v6.1.rc1/ + 10.0.0.10:8080/libresonic-v6.1/ ### 7. Log into Libresonic diff --git a/documentation/INSTALL.md b/documentation/INSTALL.md index b4dfcf15..40f97083 100644 --- a/documentation/INSTALL.md +++ b/documentation/INSTALL.md @@ -23,7 +23,7 @@ Daily WAR files are built by Jenkins and available [here](https://jenkins.zifnab 1. Download the latest war file: - wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.rc1/libresonic-main-6.1.rc1.war -O /var/lib/tomcat8/webapps/libresonic.war + wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.beta2/libresonic-main-6.1.beta2.war -O /var/lib/tomcat8/webapps/libresonic.war Note that this command copies the war file directly to the Tomcat webapps directory, and renames it to `libresonic.war`. diff --git a/libresonic-assembly/pom.xml b/libresonic-assembly/pom.xml index a3edd0d9..e3a59dfb 100644 --- a/libresonic-assembly/pom.xml +++ b/libresonic-assembly/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-booter/pom.xml b/libresonic-booter/pom.xml index f7d12845..b9f1f283 100644 --- a/libresonic-booter/pom.xml +++ b/libresonic-booter/pom.xml @@ -8,7 +8,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-installer-debian/pom.xml b/libresonic-installer-debian/pom.xml index 4dd8b5b1..07543745 100644 --- a/libresonic-installer-debian/pom.xml +++ b/libresonic-installer-debian/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-installer-mac/pom.xml b/libresonic-installer-mac/pom.xml index 29a30211..ba29bdd4 100644 --- a/libresonic-installer-mac/pom.xml +++ b/libresonic-installer-mac/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-installer-rpm/pom.xml b/libresonic-installer-rpm/pom.xml index 708ebbef..e4f0e6e9 100644 --- a/libresonic-installer-rpm/pom.xml +++ b/libresonic-installer-rpm/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-installer-windows/pom.xml b/libresonic-installer-windows/pom.xml index e400c512..d56222a8 100644 --- a/libresonic-installer-windows/pom.xml +++ b/libresonic-installer-windows/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml index 9172db2d..887193e2 100644 --- a/libresonic-main/pom.xml +++ b/libresonic-main/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties index 0d7f87c7..a71e11bb 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties @@ -819,6 +819,8 @@ helppopup.playername.text =

Allows you to specify an easy-to-remember name fo helppopup.autocontrol.title = Control player automatically helppopup.autocontrol.text =

With this option selected, {0} will automatically start the player when you click "Play" \ in the playlist. Otherwise, you must start and connect the player yourself.

+helppopup.m3ubom.title = Apply BOM in M3U file +helppopup.m3ubom.text =

Apply a BOM mark in generated M3U playlists for Unicode compatibility.

helppopup.dynamicip.title = Dynamic IP address helppopup.dynamicip.text =

Turn off this option if the player uses a static IP address.

helppopup.smtpServer.title = SMTP Server diff --git a/libresonic-rest-api/pom.xml b/libresonic-rest-api/pom.xml index 4508a551..8aee0d62 100644 --- a/libresonic-rest-api/pom.xml +++ b/libresonic-rest-api/pom.xml @@ -8,7 +8,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/libresonic-sonos-api/pom.xml b/libresonic-sonos-api/pom.xml index 393bb9b8..cba50c15 100644 --- a/libresonic-sonos-api/pom.xml +++ b/libresonic-sonos-api/pom.xml @@ -8,7 +8,7 @@ org.libresonic.player libresonic - 6.1.rc1 + 6.1 diff --git a/pom.xml b/pom.xml index 336b4f78..e53550b3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.libresonic.player libresonic - 6.1.rc1 + 6.1 Libresonic pom