From 31ddd33c9c672046807c296186367e6e2f26a00c Mon Sep 17 00:00:00 2001 From: "Eugene E. Kashpureff Jr" Date: Sat, 19 Nov 2016 03:30:37 +0000 Subject: [PATCH 1/2] Libresonic v6.1.beta2 --- CHANGELOG.md | 14 ++++++++++++++ INSTALL.md | 2 +- documentation/FreeBSD-FreeNAS-Install.md | 6 +++--- documentation/INSTALL.md | 2 +- libresonic-assembly/pom.xml | 2 +- libresonic-booter/pom.xml | 2 +- libresonic-installer-debian/pom.xml | 2 +- libresonic-installer-mac/pom.xml | 2 +- libresonic-installer-rpm/pom.xml | 2 +- libresonic-installer-windows/pom.xml | 2 +- libresonic-main/pom.xml | 2 +- libresonic-rest-api/pom.xml | 2 +- libresonic-sonos-api/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 29 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e2f876c..1a7e0f4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ # Libresonic/libresonic # --> +v6.1.beta2 +-------- + + * Metaproject: Jenkins builds! + * More documentation + * Translation updates + * Improve shuffling behaviour + * Lots of small fixes, many more to come + +v6.1.beta1 +---------- + + * Meant as a release candidate; failed to make it past the Primary election. + v6.1-alpha1 ----------- diff --git a/INSTALL.md b/INSTALL.md index c20a948b..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.beta1/libresonic-main-6.1.beta1.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 d03bf5c4..d2960a73 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.beta1" 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.beta2" 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.beta1.war navigate to: +ie if the War deployed was called libresonic-v6.1.beta2.war navigate to: - 10.0.0.10:8080/libresonic-v6.1.beta1/ + 10.0.0.10:8080/libresonic-v6.1.beta2/ ### 7. Log into Libresonic diff --git a/documentation/INSTALL.md b/documentation/INSTALL.md index c20a948b..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.beta1/libresonic-main-6.1.beta1.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 90e020bb..7f2b49bc 100644 --- a/libresonic-assembly/pom.xml +++ b/libresonic-assembly/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-booter/pom.xml b/libresonic-booter/pom.xml index 451198ff..73bbc198 100644 --- a/libresonic-booter/pom.xml +++ b/libresonic-booter/pom.xml @@ -8,7 +8,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-installer-debian/pom.xml b/libresonic-installer-debian/pom.xml index eb27e599..ac53d340 100644 --- a/libresonic-installer-debian/pom.xml +++ b/libresonic-installer-debian/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-installer-mac/pom.xml b/libresonic-installer-mac/pom.xml index 05204b09..432d5085 100644 --- a/libresonic-installer-mac/pom.xml +++ b/libresonic-installer-mac/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-installer-rpm/pom.xml b/libresonic-installer-rpm/pom.xml index c81254c9..74e86211 100644 --- a/libresonic-installer-rpm/pom.xml +++ b/libresonic-installer-rpm/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-installer-windows/pom.xml b/libresonic-installer-windows/pom.xml index 72726ecb..e9567211 100644 --- a/libresonic-installer-windows/pom.xml +++ b/libresonic-installer-windows/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml index c8103a2b..7f5481fb 100644 --- a/libresonic-main/pom.xml +++ b/libresonic-main/pom.xml @@ -9,7 +9,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-rest-api/pom.xml b/libresonic-rest-api/pom.xml index 1671a8cb..dcb9249c 100644 --- a/libresonic-rest-api/pom.xml +++ b/libresonic-rest-api/pom.xml @@ -8,7 +8,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/libresonic-sonos-api/pom.xml b/libresonic-sonos-api/pom.xml index 475a11f6..ad46cb27 100644 --- a/libresonic-sonos-api/pom.xml +++ b/libresonic-sonos-api/pom.xml @@ -8,7 +8,7 @@ org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 diff --git a/pom.xml b/pom.xml index 4756298e..40b7e0b8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.libresonic.player libresonic - 6.1.beta1 + 6.1.beta2 Libresonic pom From fa00684a27a1368dc8723366b1d02cd7c4abba52 Mon Sep 17 00:00:00 2001 From: "Eugene E. Kashpureff Jr" Date: Sat, 19 Nov 2016 03:36:50 +0000 Subject: [PATCH 2/2] Add missing help popup text from PR #108 --- .../org/libresonic/player/i18n/ResourceBundle_en.properties | 2 ++ 1 file changed, 2 insertions(+) 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