Zak Peirce
|
3d23b540ba
|
fixed some derps with merge conflicts
|
9 years ago |
|
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
|
9 years ago |
|
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
|
9 years ago |
|
Zak Peirce
|
baa681619c
|
Forgot to remove the premiumSettings.jsp
|
9 years ago |
|
Zak Peirce
|
72851f0721
|
Back ported last.fm coverart service from Subsonic 6.0_beta1
None of this code is mine, I just integrated it.
|
9 years ago |
Tom Powell
|
c2f9803adc
|
Merge pull request #182 from muff1nman/log-errors
Log Errors
|
9 years ago |
|
Tom Powell
|
51de74b7c5
|
Merge pull request #183 from muff1nman/settings-fixes
Fixes #179 and Fixes #181
|
9 years ago |
Andrew DeMaria
|
5ba7e77e11
|
Fix build dependency
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
9 years ago |
|
Andrew DeMaria
|
699ea643e2
|
Fixes #179 and Fixes #181
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
9 years ago |
|
Andrew DeMaria
|
95159ed298
|
Added logging exception resolver
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
9 years ago |
Rémi Cocula
|
449f6a906a
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
2767d06731
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
42709b0e0d
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
70ed378ae0
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
f90de5e310
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
97be70531e
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
caac456171
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
1ac243b49b
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
2c63e287df
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
8231a44089
|
Controllers migration.
|
9 years ago |
|
Zak Peirce
|
2b236e8d47
|
Missed a couple lines in the playqueuecast.jsp
|
9 years ago |
|
Zak Peirce
|
e06d9dbc22
|
Removed the rest of the license, now builds
|
9 years ago |
|
Zak Peirce
|
66ae21856c
|
Removed all traces of premium license
|
9 years ago |
|
Rémi Cocula
|
010815a578
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
878d250930
|
Merge branch 'develop' into biconou_develop_PR_SpringBoot
Conflicts:
libresonic-main/src/main/resources/libresonic-servlet.xml
|
9 years ago |
|
Tom Powell
|
74b60013c7
|
Merge pull request #177 from fxthomas/fix-shuffle-radio-spring-4
Migrate random play queues to Spring 4
|
9 years ago |
|
Rémi Cocula
|
627a8a9341
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
5b8e2b94c1
|
Controllers migration.
|
9 years ago |
|
Rémi Cocula
|
adfde5dae0
|
New GettingStarted controller
|
9 years ago |
|
Rémi Cocula
|
78022e34c3
|
make index frameset work again.
|
9 years ago |
|
Rémi Cocula
|
a51389a8d7
|
import clean up
|
9 years ago |
|
Rémi Cocula
|
cab1ee9b6e
|
Spring Boot : make login form work again.
|
9 years ago |
|
Rémi Cocula
|
88ab70117e
|
Change version to 6.2.beta1.springboot
|
9 years ago |
François-Xavier Thomas
|
22fe408818
|
Migrate random play queues to Spring 4
|
9 years ago |
|
Rémi Cocula
|
c0ee1ef786
|
Merge remote-tracking branch 'upstream/develop' into biconou_develop_PR_SpringBoot
Conflicts:
libresonic-main/src/main/resources/applicationContext-security.xml
|
9 years ago |
|
Rémi Cocula
|
2e09bc9b75
|
WIP Spring Boot
|
9 years ago |
Eugene E. Kashpureff Jr
|
7ccc81c85f
|
Merge pull request #174 into develop
|
9 years ago |
|
Eugene E. Kashpureff Jr
|
909516e4e7
|
Merge pull request #155 into develop
|
9 years ago |
|
Rémi Cocula
|
8cc6ab95fd
|
Change version number to 6.2.beta1.spring4
|
9 years ago |
|
Rémi Cocula
|
c3240b03bd
|
Remove direct Spring dependencies (as they come from SpringBoot)
|
9 years ago |
|
Andrew DeMaria
|
cadc1022f1
|
Auto locate transcoder binary
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
10 years ago |
|
Rémi Cocula
|
2ad8ec005c
|
Add SpringBoot application.
|
10 years ago |
|
Rémi Cocula
|
33b7d81dd9
|
Merge branch 'biconou_spring-4-update_PR' into biconou_develop_PR_SpringBoot
|
10 years ago |
|
Rémi Cocula
|
5ae6f5462a
|
Clean up dependencies
|
10 years ago |
|
Rémi Cocula
|
63253e4ff8
|
Intoduce SpringBoot
|
10 years ago |
|
Tom Powell
|
7a8c0465c3
|
Merge pull request #168 from fxthomas/145-infinite-shuffle
Shuffle radio
|
10 years ago |
|
Rémi Cocula
|
ddd8498040
|
Move to Spring4 + remove PasswordSettingsController + remove PremiumSettingsController
|
10 years ago |
|
Rémi Cocula
|
d78244aa36
|
Corrections on UserSettingsController.
|
10 years ago |
|
Rémi Cocula
|
ddea3f47ff
|
Corrections on PlayerSettingsController and SearchController.
|
10 years ago |
|
Rémi Cocula
|
4561e38807
|
Corrections on GeneralSettingsController.
|
10 years ago |
