Commit Graph
213 Commits
Author SHA1 Message Date
Tom PowellandGitHub f402731ce7 Merge pull request #197 from DavidARussell/issue131_fileFormat_display
Use original file type for display formatting
2016-12-30 21:43:39 -08:00
David Russell 7d9aa70555 Use original file type for display formatting
The bitrate column uses the original file, so the file type column
should do the same for consistency.

Fixes #131

Signed-off-by: David Russell <david.russell.scotland@gmail.com>
2016-12-30 22:17:26 +00: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
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
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
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
Zak Peirce 72851f0721 Back ported last.fm coverart service from Subsonic 6.0_beta1
None of this code is mine, I just integrated it.
2016-12-20 11:41:02 -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