MightyPork
/
airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 6.1.beta2 into stable

Browse Source 
Conflicts:
	CHANGELOG.md
	INSTALL.md
	documentation/FreeBSD-FreeNAS-Install.md
	documentation/INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-installer-debian/pom.xml
	libresonic-installer-mac/pom.xml
	libresonic-installer-rpm/pom.xml
	libresonic-installer-windows/pom.xml
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml
master
Eugene E. Kashpureff Jr 8 years ago
parent 6ec5b4ef25 fa00684a27
commit 5c5bce6f8d
15 changed files with 18 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      CHANGELOG.md
  2. 2
      INSTALL.md
  3. 6
      documentation/FreeBSD-FreeNAS-Install.md
  4. 2
      documentation/INSTALL.md
  5. 2
      libresonic-assembly/pom.xml
  6. 2
      libresonic-booter/pom.xml
  7. 2
      libresonic-installer-debian/pom.xml
  8. 2
      libresonic-installer-mac/pom.xml
  9. 2
      libresonic-installer-rpm/pom.xml
  10. 2
      libresonic-installer-windows/pom.xml
  11. 2
      libresonic-main/pom.xml
  12. 2
      libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
  13. 2
      libresonic-rest-api/pom.xml
  14. 2
      libresonic-sonos-api/pom.xml
  15. 2
      pom.xml

2
CHANGELOG.md
Unescape View File

@ -3,7 +3,7 @@
# Libresonic/libresonic # Libresonic/libresonic
# --> # -->
v6.1.rc1 v6.1.beta2
-------- --------
* Metaproject: Jenkins builds! * Metaproject: Jenkins builds!

2
INSTALL.md
Unescape View File

@ -23,7 +23,7 @@ Daily WAR files are built by Jenkins and available [here](https://jenkins.zifnab
1. Download the latest war file: 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`. Note that this command copies the war file directly to the Tomcat webapps directory, and renames it to `libresonic.war`.

6
documentation/FreeBSD-FreeNAS-Install.md
Unescape View File

@ -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 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 ### 6. Navigate to Libresonic
In a browser. Take your server IP address and port and append the the context path from above 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 ### 7. Log into Libresonic

2
documentation/INSTALL.md
Unescape View File

@ -23,7 +23,7 @@ Daily WAR files are built by Jenkins and available [here](https://jenkins.zifnab
1. Download the latest war file: 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`. Note that this command copies the war file directly to the Tomcat webapps directory, and renames it to `libresonic.war`.

2
libresonic-assembly/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<dependencies> <dependencies>

2
libresonic-booter/pom.xml
Unescape View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<dependencies> <dependencies>

2
libresonic-installer-debian/pom.xml vendored
Unescape View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<profiles> <profiles>

2
libresonic-installer-mac/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<dependencies> <dependencies>

2
libresonic-installer-rpm/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<profiles> <profiles>

2
libresonic-installer-windows/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<properties> <properties>

2
libresonic-main/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<dependencies> <dependencies>

2
libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
Unescape View File

@ -819,6 +819,8 @@ helppopup.playername.text = <p>Allows you to specify an easy-to-remember name fo
helppopup.autocontrol.title = Control player automatically helppopup.autocontrol.title = Control player automatically
helppopup.autocontrol.text = <p>With this option selected, {0} will automatically start the player when you click "Play" \ helppopup.autocontrol.text = <p>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.</p> in the playlist. Otherwise, you must start and connect the player yourself.</p>
helppopup.m3ubom.title = Apply BOM in M3U file
helppopup.m3ubom.text = <p>Apply a BOM mark in generated M3U playlists for Unicode compatibility.</p>
helppopup.dynamicip.title = Dynamic IP address helppopup.dynamicip.title = Dynamic IP address
helppopup.dynamicip.text = <p>Turn off this option if the player uses a static IP address.</p> helppopup.dynamicip.text = <p>Turn off this option if the player uses a static IP address.</p>
helppopup.smtpServer.title = SMTP Server helppopup.smtpServer.title = SMTP Server

2
libresonic-rest-api/pom.xml
Unescape View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<build> <build>

2
libresonic-sonos-api/pom.xml
Unescape View File

@ -8,7 +8,7 @@
<parent> <parent>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
</parent> </parent>
<build> <build>

2
pom.xml
Unescape View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.libresonic.player</groupId> <groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId> <artifactId>libresonic</artifactId>
<version>6.1.rc1</version> <version>6.1</version>
<name>Libresonic</name> <name>Libresonic</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<organization> <organization>

Write Preview
Loading…
Cancel
Save