3d23b540ba
fixed some derps with merge conflicts
8 years ago
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
8 years ago
baa681619c
Forgot to remove the premiumSettings.jsp
8 years ago
c2f9803adc
Merge pull request #182 from muff1nman/log-errors
...
Log Errors
8 years ago
51de74b7c5
Merge pull request #183 from muff1nman/settings-fixes
...
Fixes #179 and Fixes #181
8 years ago
5ba7e77e11
Fix build dependency
...
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
8 years ago
699ea643e2
Fixes #179 and Fixes #181
...
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
8 years ago
95159ed298
Added logging exception resolver
...
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
8 years ago
2b236e8d47
Missed a couple lines in the playqueuecast.jsp
8 years ago
e06d9dbc22
Removed the rest of the license, now builds
8 years ago
66ae21856c
Removed all traces of premium license
8 years ago
74b60013c7
Merge pull request #177 from fxthomas/fix-shuffle-radio-spring-4
...
Migrate random play queues to Spring 4
8 years ago
22fe408818
Migrate random play queues to Spring 4
8 years ago
7ccc81c85f
Merge pull request #174 into develop
8 years ago
909516e4e7
Merge pull request #155 into develop
8 years ago
8cc6ab95fd
Change version number to 6.2.beta1.spring4
8 years ago
cadc1022f1
Auto locate transcoder binary
...
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
8 years ago
5ae6f5462a
Clean up dependencies
8 years ago
7a8c0465c3
Merge pull request #168 from fxthomas/145-infinite-shuffle
...
Shuffle radio
8 years ago
ddd8498040
Move to Spring4 + remove PasswordSettingsController + remove PremiumSettingsController
8 years ago
d78244aa36
Corrections on UserSettingsController.
8 years ago
ddea3f47ff
Corrections on PlayerSettingsController and SearchController.
8 years ago
4561e38807
Corrections on GeneralSettingsController.
8 years ago
b2b4384387
Corrections on MusicFolderSettingsController.
8 years ago
a0ab86a6ac
Corrections on NetworkSettingsController.
8 years ago
ba80e99703
Migration of PersonalSettingsController + unit test.
8 years ago
6d8df63a7e
Implement shuffle radio feature ( #145 )
8 years ago
a2deb0b779
Merge Pull Request #167 into develop
8 years ago
24328a1d08
Doc: Move build and migration docs to documentation/
8 years ago
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>
8 years ago
31762a3e50
Doc: Add documentation for reverse proxying
8 years ago
f4636a09ed
Migration of UserSettingsController + unit test.
8 years ago
0c265e2f3d
Migration of SearchController + unit test.
8 years ago
c46416834b
Migration of PlayerSettingsController + unit test.
8 years ago
33c16db802
Dont refresh key between server restarts
...
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
8 years ago
5023ba5875
Fix remember me
...
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
8 years ago
7c5d8088dc
Fix SQL table and column being incorrectly swapped
...
Signed-off-by: Thomas Bastiani <thom@codehawks.eu>
8 years ago
7a76a3ea75
Migration of GeneralSettingsController + unit test.
8 years ago
f5a380eada
Migration of MusicFolderSettingsController + unit test.
8 years ago
9bdbb5ab4f
Migration of NetworkSettingsController + unit test.
8 years ago
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>
8 years ago
d422fc4086
Begin of migration of deprecated controllers style.
8 years ago
f6541632bb
Add temporary test jetty server (to be removed later).
8 years ago
3354f6623a
Change version to 6.2.spring4-SNAPSHOT.
8 years ago
02544d8406
LoginController : no need to declare members final.
8 years ago
c7c2ee4875
Merge branch 'biconou_spring-3-update_PR' into biconou_spring-4-update_PR
8 years ago
c50060884d
Merge Pull Request #137 into develop
...
Conflicts:
libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
8 years ago
9d3d6ce52d
Merge Pull Request #124 into develop
8 years ago
e51edb3e20
Merge Pull Request #110 into develop
8 years ago
9b48d45d51
Fix libresonic-booter crash with Spring 3
8 years ago
Zak Peirce
Tom Powell
Andrew DeMaria
François-Xavier Thomas
Eugene E. Kashpureff Jr
Rémi Cocula
Ben Kelsey
Thomas Bastiani