Rémi Cocula
|
d8919d9cb9
|
Fix after merge.
|
8 years ago |
|
Rémi Cocula
|
e5dc517fa1
|
Merge branch 'develop' into _tmp
Conflicts:
libresonic-main/pom.xml
libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
libresonic-main/src/main/webapp/WEB-INF/libresonic-servlet.xml
pom.xml
|
8 years ago |
|
Rémi Cocula
|
b2dd04e864
|
Controller migration
|
8 years ago |
|
Rémi Cocula
|
b8ade50810
|
Controller migration
|
8 years ago |
|
Rémi Cocula
|
8c81778f5a
|
Controller migration
|
8 years ago |
|
Rémi Cocula
|
217caba28f
|
Controller migration
|
8 years ago |
|
Rémi Cocula
|
2bb026b968
|
Controller migration
|
8 years ago |
Tom Powell
|
8d28f2ab87
|
Merge pull request #185 from plastikman/develop-nolicense-fixcoverart
Cherry picked https://sourceforge.net/p/subsonic/code/4587/
|
8 years ago |
|
Tom Powell
|
c9afbac242
|
Merge pull request #178 from plastikman/nolicense
Remove all premium/license calls.
|
8 years ago |
Eugene E. Kashpureff Jr
|
e13730a927
|
Merge pull request #187
Update INSTALL.md
|
8 years ago |
Alex Fornuto
|
bf91a6467c
|
Update INSTALL.md
|
8 years ago |
Zak Peirce
|
7e9c2582f5
|
fixed derps with merges
|
8 years ago |
|
Zak Peirce
|
3d23b540ba
|
fixed some derps with merge conflicts
|
8 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
|
8 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
|
8 years ago |
|
Zak Peirce
|
baa681619c
|
Forgot to remove the premiumSettings.jsp
|
8 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.
|
8 years ago |
|
Tom Powell
|
c2f9803adc
|
Merge pull request #182 from muff1nman/log-errors
Log Errors
|
8 years ago |
|
Tom Powell
|
51de74b7c5
|
Merge pull request #183 from muff1nman/settings-fixes
Fixes #179 and Fixes #181
|
8 years ago |
Andrew DeMaria
|
5ba7e77e11
|
Fix build dependency
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
8 years ago |
|
Andrew DeMaria
|
699ea643e2
|
Fixes #179 and Fixes #181
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
8 years ago |
|
Andrew DeMaria
|
95159ed298
|
Added logging exception resolver
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
8 years ago |
|
Rémi Cocula
|
449f6a906a
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
2767d06731
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
42709b0e0d
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
70ed378ae0
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
f90de5e310
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
97be70531e
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
caac456171
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
1ac243b49b
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
2c63e287df
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
8231a44089
|
Controllers migration.
|
8 years ago |
|
Zak Peirce
|
2b236e8d47
|
Missed a couple lines in the playqueuecast.jsp
|
8 years ago |
|
Zak Peirce
|
e06d9dbc22
|
Removed the rest of the license, now builds
|
8 years ago |
|
Zak Peirce
|
66ae21856c
|
Removed all traces of premium license
|
8 years ago |
|
Rémi Cocula
|
010815a578
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
878d250930
|
Merge branch 'develop' into biconou_develop_PR_SpringBoot
Conflicts:
libresonic-main/src/main/resources/libresonic-servlet.xml
|
8 years ago |
|
Tom Powell
|
74b60013c7
|
Merge pull request #177 from fxthomas/fix-shuffle-radio-spring-4
Migrate random play queues to Spring 4
|
8 years ago |
|
Rémi Cocula
|
627a8a9341
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
5b8e2b94c1
|
Controllers migration.
|
8 years ago |
|
Rémi Cocula
|
adfde5dae0
|
New GettingStarted controller
|
8 years ago |
|
Rémi Cocula
|
78022e34c3
|
make index frameset work again.
|
8 years ago |
|
Rémi Cocula
|
a51389a8d7
|
import clean up
|
8 years ago |
|
Rémi Cocula
|
cab1ee9b6e
|
Spring Boot : make login form work again.
|
8 years ago |
|
Rémi Cocula
|
88ab70117e
|
Change version to 6.2.beta1.springboot
|
8 years ago |
François-Xavier Thomas
|
22fe408818
|
Migrate random play queues to Spring 4
|
8 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
|
8 years ago |
|
Rémi Cocula
|
2e09bc9b75
|
WIP Spring Boot
|
8 years ago |
|
Eugene E. Kashpureff Jr
|
b98f73bc84
|
New logo.
Signed-off-by: Tiago <tiago@tdias.tech>
Cherry picked from commit 33de00c1
Closes Pull Request #171
|
8 years ago |
|
Eugene E. Kashpureff Jr
|
7ccc81c85f
|
Merge pull request #174 into develop
|
8 years ago |
