MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,420 Commits 2 Branches 0 Tags
6c54f1f7c84787bf61595de5ca54143bcdf55eed
Commit Graph
1420 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zak Peirce 3d23b540ba fixed some derps with merge conflicts 2016-12-20 13:27:25 -08:00
Zak Peirce 28f81a7107 Merge branch 'develop' into develop-nolicense-fixcoverart 
Conflicts:
	libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
 2016-12-20 13:24:36 -08:00
Zak Peirce b0e91b5569 Merge branch 'develop' of github.com:libresonic/libresonic into nolicense 
Conflicts:
	libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
	libresonic-main/src/main/webapp/WEB-INF/jsp/premiumSettings.jsp
 2016-12-20 13:19:34 -08:00
Zak Peirce baa681619c Forgot to remove the premiumSettings.jsp 2016-12-20 12:33:55 -08:00
Zak Peirce 72851f0721 Back ported last.fm coverart service from Subsonic 6.0_beta1 
None of this code is mine, I just integrated it.
 2016-12-20 11:41:02 -08:00
Tom PowellandGitHub c2f9803adc Merge pull request #182 from muff1nman/log-errors 
Log Errors
 2016-12-18 19:49:08 -08:00
Tom PowellandGitHub 51de74b7c5 Merge pull request #183 from muff1nman/settings-fixes 
Fixes #179 and Fixes #181
 2016-12-18 19:48:36 -08:00
Andrew DeMaria 5ba7e77e11 Fix build dependency 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-18 20:00:33 -07:00
Andrew DeMaria 699ea643e2 Fixes #179 and Fixes #181 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-18 19:51:03 -07:00
Andrew DeMaria 95159ed298 Added logging exception resolver 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-18 19:50:40 -07:00
Rémi Cocula 449f6a906a Controllers migration. 2016-12-18 01:31:39 +01:00
Rémi Cocula 2767d06731 Controllers migration. 2016-12-18 01:14:33 +01:00
Rémi Cocula 42709b0e0d Controllers migration. 2016-12-18 01:07:35 +01:00
Rémi Cocula 70ed378ae0 Controllers migration. 2016-12-18 00:12:16 +01:00
Rémi Cocula f90de5e310 Controllers migration. 2016-12-18 00:08:05 +01:00
Rémi Cocula 97be70531e Controllers migration. 2016-12-17 19:15:00 +01:00
Rémi Cocula caac456171 Controllers migration. 2016-12-17 19:11:32 +01:00
Rémi Cocula 1ac243b49b Controllers migration. 2016-12-17 17:05:02 +01:00
Rémi Cocula 2c63e287df Controllers migration. 2016-12-17 14:15:27 +01:00
Rémi Cocula 8231a44089 Controllers migration. 2016-12-17 14:11:47 +01:00
Zak Peirce 2b236e8d47 Missed a couple lines in the playqueuecast.jsp 2016-12-16 12:15:40 -08:00
Zak Peirce e06d9dbc22 Removed the rest of the license, now builds 2016-12-16 11:50:44 -08:00
Zak Peirce 66ae21856c Removed all traces of premium license 2016-12-16 10:46:40 -08:00
Rémi Cocula 010815a578 Controllers migration. 2016-12-16 00:02:02 +01:00
Rémi Cocula 878d250930 Merge branch 'develop' into biconou_develop_PR_SpringBoot 
Conflicts:
	libresonic-main/src/main/resources/libresonic-servlet.xml
 2016-12-15 23:26:38 +01:00
Tom PowellandGitHub 74b60013c7 Merge pull request #177 from fxthomas/fix-shuffle-radio-spring-4 
Migrate random play queues to Spring 4
 2016-12-15 14:22:38 -08:00
Rémi Cocula 627a8a9341 Controllers migration. 2016-12-15 23:16:20 +01:00
Rémi Cocula 5b8e2b94c1 Controllers migration. 2016-12-15 23:06:05 +01:00
Rémi Cocula adfde5dae0 New GettingStarted controller 2016-12-15 21:47:18 +01:00
Rémi Cocula 78022e34c3 make index frameset work again. 2016-12-15 21:38:18 +01:00
Rémi Cocula a51389a8d7 import clean up 2016-12-14 23:57:12 +01:00
Rémi Cocula cab1ee9b6e Spring Boot : make login form work again. 2016-12-14 22:55:21 +01:00
Rémi Cocula 88ab70117e Change version to 6.2.beta1.springboot 2016-12-14 21:01:16 +01:00
François-Xavier Thomas 22fe408818 Migrate random play queues to Spring 4 2016-12-14 12:05:31 +01:00
Rémi Cocula c0ee1ef786 Merge remote-tracking branch 'upstream/develop' into biconou_develop_PR_SpringBoot 
Conflicts:
	libresonic-main/src/main/resources/applicationContext-security.xml
 2016-12-14 00:29:35 +01:00
Rémi Cocula 2e09bc9b75 WIP Spring Boot 2016-12-14 00:24:58 +01:00
Eugene E. Kashpureff Jr b98f73bc84 New logo. 
Signed-off-by: Tiago <tiago@tdias.tech>

Cherry picked from commit 33de00c1
Closes Pull Request #171
 2016-12-13 03:11:49 +00:00
Eugene E. Kashpureff JrandGitHub 7ccc81c85f Merge pull request #174 into develop 2016-12-12 19:02:47 -08:00
Eugene E. Kashpureff JrandGitHub 909516e4e7 Merge pull request #155 into develop 2016-12-12 19:01:45 -08:00
Rémi Cocula 8cc6ab95fd Change version number to 6.2.beta1.spring4 2016-12-12 21:37:42 +01:00
Rémi Cocula c3240b03bd Remove direct Spring dependencies (as they come from SpringBoot) 2016-12-12 21:20:01 +01:00
Andrew DeMaria cadc1022f1 Auto locate transcoder binary 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-12-11 20:58:29 -07:00
Rémi Cocula 2ad8ec005c Add SpringBoot application. 2016-12-11 22:39:13 +01:00
Rémi Cocula 33b7d81dd9 Merge branch 'biconou_spring-4-update_PR' into biconou_develop_PR_SpringBoot 2016-12-11 22:23:52 +01:00
Rémi Cocula 5ae6f5462a Clean up dependencies 2016-12-11 22:23:22 +01:00
Rémi Cocula 63253e4ff8 Intoduce SpringBoot 2016-12-11 21:46:31 +01:00
Tom PowellandGitHub 7a8c0465c3 Merge pull request #168 from fxthomas/145-infinite-shuffle 
Shuffle radio
 2016-12-11 12:20:43 -08:00
Rémi Cocula ddd8498040 Move to Spring4 + remove PasswordSettingsController + remove PremiumSettingsController 2016-12-11 21:13:51 +01:00
Rémi Cocula d78244aa36 Corrections on UserSettingsController. 2016-12-11 19:31:33 +01:00
Rémi Cocula ddea3f47ff Corrections on PlayerSettingsController and SearchController. 2016-12-11 19:21:02 +01:00