Rémi Cocula
|
f829176c31
|
Merge branch 'develop' into _tmp
|
2016-12-30 19:31:11 +01:00 |
|
Rémi Cocula
|
fc01f8f83c
|
Spring security configuration has moved to java.
|
2016-12-30 19:29:01 +01:00 |
|
 Ruggero RussoandAndrew DeMaria
|
7191d804ec
|
Updated jaxb2 plugin to allow generation in non UTF-8 encoding
|
2016-12-27 18:04:37 -07:00 |
|
Eugene E. Kashpureff Jr
|
752704c15d
|
Merge Pull Request #172 into develop. #yolo
|
2016-12-28 00:38:19 +00:00 |
|
Rémi Cocula
|
97f3607b1c
|
Register REST Filter
|
2016-12-24 23:39:14 +01:00 |
|
Rémi Cocula
|
87a9cb1c12
|
RESTRequestParameterProcessingFilter moved to annotated bean.
|
2016-12-24 23:36:54 +01:00 |
|
Rémi Cocula
|
e301f2363f
|
Start RestController migration.
|
2016-12-24 22:03:57 +01:00 |
|
Rémi Cocula
|
f76470537f
|
Controller migration
|
2016-12-24 19:45:44 +01:00 |
|
Rémi Cocula
|
376f98d670
|
Controller migration
|
2016-12-24 12:20:20 +01:00 |
|
Rémi Cocula
|
b2d58fee47
|
Controller migration
|
2016-12-24 12:08:42 +01:00 |
|
Rémi Cocula
|
24996c628e
|
Controller migration
|
2016-12-24 11:53:59 +01:00 |
|
Rémi Cocula
|
cf8a0f6d70
|
Controller migration
|
2016-12-24 11:47:46 +01:00 |
|
Andrew DeMaria
|
0749b5f281
|
Removed no longer needed setting for mysql
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 15:16:45 -07:00 |
|
Andrew DeMaria
|
a097644e5f
|
Created a better workaround for https://liquibase.jira.com/browse/CORE-2966
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 15:16:41 -07:00 |
|
Andrew DeMaria
|
9540167d49
|
Revert "Only create indices with tables"
This reverts commit f26addfd1b.
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 15:16:37 -07:00 |
|
 Eugene E. Kashpureff JrandGitHub
|
ea592d7778
|
Merge pull request #188 from fxthomas/fix-shortcuts-and-coverart-overflow
Fix shortcut help text and cover art overflow
|
2016-12-23 13:21:14 -08:00 |
|
 Eugene E. Kashpureff JrandGitHub
|
3dd21c6465
|
Merge pull request #171
New logo.
|
2016-12-23 13:20:19 -08:00 |
|
François-Xavier Thomas
|
cd348fe21e
|
Fix typo in 'next song' keyboard shortcut help
|
2016-12-23 21:41:01 +01:00 |
|
François-Xavier Thomas
|
df345f0342
|
Hide cover art overflows again when needed
|
2016-12-23 21:40:52 +01:00 |
|
Andrew DeMaria
|
0cbd3ad538
|
Fix overflow and tests
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 12:10:54 -07:00 |
|
 Sergio Navarro FernándezandAndrew DeMaria
|
30bc5a90f5
|
Update StringUtil.java
Added TB
|
2016-12-23 11:55:37 -07:00 |
|
Andrew DeMaria
|
478c32a631
|
Mark old checksums as valid
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:42:06 -07:00 |
|
Andrew DeMaria
|
f26addfd1b
|
Only create indices with tables
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:42:02 -07:00 |
|
Andrew DeMaria
|
667367280f
|
Added testcase to reproduce liquibase failure
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:41:58 -07:00 |
|
Andrew DeMaria
|
18e793c64d
|
Make dao layer more db vendor agnostic
- Removed usages of TOP
- Dont send null for autogenerate columns
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:41:55 -07:00 |
|
Andrew DeMaria
|
f60811e51b
|
Fix ambigous constructor ref that seems to only happen on debian
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:41:51 -07:00 |
|
Andrew DeMaria
|
529cb6c317
|
Added documentation
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:40:47 -07:00 |
|
Andrew DeMaria
|
4b34bc0139
|
Convert to liquibase from handrolled migration tool
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:40:40 -07:00 |
|
Andrew DeMaria
|
1d9b7d48c5
|
Migrate from Properties to Commons-Configuration
- Added loading of properties file before database initialization
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:40:23 -07:00 |
|
Andrew DeMaria
|
762ce0ad52
|
Revert "Auto locate transcoder binary"
This reverts commit cadc1022f1.
On further testing, this needs more work.
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 11:31:49 -07:00 |
|
Andrew DeMaria
|
f344fbb989
|
Fixes #180 Display validation errors on user settings tab
Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
|
2016-12-23 10:53:03 -07:00 |
|
Rémi Cocula
|
a0f7966163
|
StreamController migration
|
2016-12-23 02:59:32 +01:00 |
|
Rémi Cocula
|
b7b42ea4cb
|
Exclude /dwr urls from csrf validation.
|
2016-12-23 02:48:46 +01:00 |
|
Rémi Cocula
|
ed7758acab
|
registration of dwr servlet
|
2016-12-23 01:31:29 +01:00 |
|
Rémi Cocula
|
d8919d9cb9
|
Fix after merge.
|
2016-12-22 23:57:15 +01:00 |
|
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
|
2016-12-22 23:26:10 +01:00 |
|
Rémi Cocula
|
b2dd04e864
|
Controller migration
|
2016-12-22 22:17:48 +01:00 |
|
Rémi Cocula
|
b8ade50810
|
Controller migration
|
2016-12-22 21:58:46 +01:00 |
|
Rémi Cocula
|
8c81778f5a
|
Controller migration
|
2016-12-22 21:54:12 +01:00 |
|
Rémi Cocula
|
217caba28f
|
Controller migration
|
2016-12-22 21:49:44 +01:00 |
|
Rémi Cocula
|
2bb026b968
|
Controller migration
|
2016-12-22 21:47:31 +01:00 |
|
 Tom PowellandGitHub
|
8d28f2ab87
|
Merge pull request #185 from plastikman/develop-nolicense-fixcoverart
Cherry picked https://sourceforge.net/p/subsonic/code/4587/
|
2016-12-22 12:15:49 -08:00 |
|
 Tom PowellandGitHub
|
c9afbac242
|
Merge pull request #178 from plastikman/nolicense
Remove all premium/license calls.
|
2016-12-22 12:15:32 -08:00 |
|
 Eugene E. Kashpureff JrandGitHub
|
e13730a927
|
Merge pull request #187
Update INSTALL.md
|
2016-12-22 12:06:10 -08:00 |
|
 Alex Fornutoandalexfornuto
|
bf91a6467c
|
Update INSTALL.md
|
2016-12-21 22:37:58 -05:00 |
|
Zak Peirce
|
7e9c2582f5
|
fixed derps with merges
|
2016-12-20 13:29:32 -08:00 |
|
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 |
|