MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
185 Commits 2 Branches 0 Tags
c9afbac242ed7985867a8e83226bc2a8fa4367a4
Commit Graph
185 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom PowellandGitHub c9afbac242 Merge pull request #178 from plastikman/nolicense 
Remove all premium/license calls.
 2016-12-22 12:15:32 -08:00
Zak Peirce 3d23b540ba fixed some derps with merge conflicts 2016-12-20 13:27:25 -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
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
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
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
François-Xavier Thomas 22fe408818 Migrate random play queues to Spring 4 2016-12-14 12:05:31 +01: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
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 5ae6f5462a Clean up dependencies 2016-12-11 22:23:22 +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
Rémi Cocula 4561e38807 Corrections on GeneralSettingsController. 2016-12-11 19:11:29 +01:00
Rémi Cocula b2b4384387 Corrections on MusicFolderSettingsController. 2016-12-11 19:03:41 +01:00
Rémi Cocula a0ab86a6ac Corrections on NetworkSettingsController. 2016-12-11 17:44:31 +01:00
Rémi Cocula ba80e99703 Migration of PersonalSettingsController + unit test. 2016-12-11 17:18:28 +01:00
François-Xavier Thomas 6d8df63a7e Implement shuffle radio feature (#145) 2016-12-11 15:18:15 +01:00
Eugene E. Kashpureff Jr a2deb0b779 Merge Pull Request #167 into develop 2016-12-09 01:47:39 +00:00
François-Xavier Thomas 24328a1d08 Doc: Move build and migration docs to documentation/ 2016-12-07 23:25:19 +01:00
Ben Kelsey c9536ff310 This upgrades Apache HttpClient 
- Update to latest version of httpclient and httpcomponents
- Fixes resulting deprecations
- Switch to using try with resources

Signed-off-by: Ben Kelsey <bfkelsey@gmail.com>
 2016-12-06 21:25:45 -08:00
François-Xavier Thomas 31762a3e50 Doc: Add documentation for reverse proxying 2016-12-06 22:33:58 +01:00
Rémi Cocula f4636a09ed Migration of UserSettingsController + unit test. 2016-12-06 19:51:24 +01:00
Rémi Cocula 0c265e2f3d Migration of SearchController + unit test. 2016-12-01 22:19:28 +01:00
Rémi Cocula c46416834b Migration of PlayerSettingsController + unit test. 2016-12-01 21:53:55 +01:00
Andrew DeMariaandAndrew DeMaria 33c16db802 Dont refresh key between server restarts 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-11-30 15:22:59 -07:00
Andrew DeMariaandAndrew DeMaria 5023ba5875 Fix remember me 
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-11-30 15:22:59 -07:00
Thomas BastianiandAndrew DeMaria 7c5d8088dc Fix SQL table and column being incorrectly swapped 
Signed-off-by: Thomas Bastiani <thom@codehawks.eu>
 2016-11-30 15:16:23 -07:00
Rémi Cocula 7a76a3ea75 Migration of GeneralSettingsController + unit test. 2016-11-30 22:22:05 +01:00
Rémi Cocula f5a380eada Migration of MusicFolderSettingsController + unit test. 2016-11-30 22:05:40 +01:00
Rémi Cocula 9bdbb5ab4f Migration of NetworkSettingsController + unit test. 2016-11-30 21:10:18 +01:00
Andrew DeMaria d6999baa2d Fix login redirect not working occasionally 
This forces the loading of the index page during login as was done prior
in acegi security. It is a necessary crutch for now because libresonic
doesn't retain a good targetUrl at all times.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
 2016-11-29 19:26:16 -07:00
Rémi Cocula d422fc4086 Begin of migration of deprecated controllers style. 2016-11-30 00:18:50 +01:00
Rémi Cocula f6541632bb Add temporary test jetty server (to be removed later). 2016-11-29 23:03:07 +01:00
Rémi Cocula 3354f6623a Change version to 6.2.spring4-SNAPSHOT. 2016-11-28 21:22:20 +01:00
Rémi Cocula 02544d8406 LoginController : no need to declare members final. 2016-11-28 20:52:03 +01:00
Rémi Cocula c7c2ee4875 Merge branch 'biconou_spring-3-update_PR' into biconou_spring-4-update_PR 2016-11-28 20:49:53 +01:00
Eugene E. Kashpureff Jr c50060884d Merge Pull Request #137 into develop 
Conflicts:
	libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
 2016-11-27 23:05:38 +00:00
Eugene E. Kashpureff Jr 9d3d6ce52d Merge Pull Request #124 into develop 2016-11-27 23:00:58 +00:00
Eugene E. Kashpureff Jr e51edb3e20 Merge Pull Request #110 into develop 2016-11-27 23:00:01 +00:00